diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp index 038122fd..29655a5c 100644 --- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp +++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp @@ -242,9 +242,9 @@ FindReplaceDlg::~FindReplaceDlg() delete[] _uniFileName; } -void FindReplaceDlg::create(int dialogID, bool isRTL) +void FindReplaceDlg::create(int dialogID, bool isRTL, bool msgDestParent) { - StaticDialog::create(dialogID, isRTL); + StaticDialog::create(dialogID, isRTL, msgDestParent); fillFindHistory(); _currentStatus = REPLACE_DLG; initOptionsFromDlg(); diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.h b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.h index e2b4b2e7..3e6eb1c6 100644 --- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.h +++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.h @@ -242,7 +242,7 @@ public : _ppEditView = ppEditView; }; - virtual void create(int dialogID, bool isRTL = false); + virtual void create(int dialogID, bool isRTL = false, bool msgDestParent = true); void initOptionsFromDlg(); diff --git a/PowerEditor/src/ScitillaComponent/GoToLineDlg.h b/PowerEditor/src/ScitillaComponent/GoToLineDlg.h index b7fd9ffa..12408311 100644 --- a/PowerEditor/src/ScitillaComponent/GoToLineDlg.h +++ b/PowerEditor/src/ScitillaComponent/GoToLineDlg.h @@ -42,8 +42,8 @@ public : _ppEditView = ppEditView; }; - virtual void create(int dialogID, bool isRTL = false) { - StaticDialog::create(dialogID, isRTL); + virtual void create(int dialogID, bool isRTL = false, bool msgDestParent = true) { + StaticDialog::create(dialogID, isRTL, msgDestParent); }; void doDialog(bool isRTL = false) { diff --git a/PowerEditor/src/ScitillaComponent/UserDefineDialog.h b/PowerEditor/src/ScitillaComponent/UserDefineDialog.h index 382626ad..835d9ec8 100644 --- a/PowerEditor/src/ScitillaComponent/UserDefineDialog.h +++ b/PowerEditor/src/ScitillaComponent/UserDefineDialog.h @@ -329,8 +329,8 @@ public : void setScintilla(ScintillaEditView *pScinView) { _pScintilla = pScinView; }; - virtual void create(int dialogID, bool isRTL = false) { - StaticDialog::create(dialogID, isRTL); + virtual void create(int dialogID, bool isRTL = false, bool msgDestParent = true) { + StaticDialog::create(dialogID, isRTL, msgDestParent); } void destroy() { // A Ajouter les fils... diff --git a/PowerEditor/src/ScitillaComponent/columnEditor.h b/PowerEditor/src/ScitillaComponent/columnEditor.h index 9201443d..468523af 100644 --- a/PowerEditor/src/ScitillaComponent/columnEditor.h +++ b/PowerEditor/src/ScitillaComponent/columnEditor.h @@ -42,8 +42,8 @@ public : void init(HINSTANCE hInst, HWND hPere, ScintillaEditView **ppEditView); - virtual void create(int dialogID, bool isRTL = false) { - StaticDialog::create(dialogID, isRTL); + virtual void create(int dialogID, bool isRTL = false, bool msgDestParent = true) { + StaticDialog::create(dialogID, isRTL, msgDestParent); }; void doDialog(bool isRTL = false) { diff --git a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp index 9728ad65..52233630 100644 --- a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp +++ b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp @@ -836,9 +836,9 @@ void WordStyleDlg::setVisualFromStyleList() } -void WordStyleDlg::create(int dialogID, bool isRTL) +void WordStyleDlg::create(int dialogID, bool isRTL, bool msgDestParent) { - StaticDialog::create(dialogID, isRTL); + StaticDialog::create(dialogID, isRTL, msgDestParent); if ((NppParameters::getInstance())->isTransparentAvailable()) { diff --git a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.h b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.h index f9eb7463..3268bf7f 100644 --- a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.h +++ b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.h @@ -74,7 +74,7 @@ public : Window::init(hInst, parent); }; - virtual void create(int dialogID, bool isRTL = false); + virtual void create(int dialogID, bool isRTL = false, bool msgDestParent = true); void doDialog(bool isRTL = false) { if (!isCreated()) @@ -96,7 +96,7 @@ public : _gOverride2restored = (NppParameters::getInstance())->getGlobalOverrideStyle(); }; - virtual void redraw() const { + virtual void redraw(bool forceUpdate = false) const { _pFgColour->redraw(); _pBgColour->redraw(); ::InvalidateRect(_hStyleInfoStaticText, NULL, TRUE); diff --git a/PowerEditor/src/WinControls/FindCharsInRange/FindCharsInRange.h b/PowerEditor/src/WinControls/FindCharsInRange/FindCharsInRange.h index c09555d6..39a80351 100644 --- a/PowerEditor/src/WinControls/FindCharsInRange/FindCharsInRange.h +++ b/PowerEditor/src/WinControls/FindCharsInRange/FindCharsInRange.h @@ -49,8 +49,8 @@ public : _ppEditView = ppEditView; }; - virtual void create(int dialogID, bool isRTL = false) { - StaticDialog::create(dialogID, isRTL); + virtual void create(int dialogID, bool isRTL = false, bool msgDestParent = true) { + StaticDialog::create(dialogID, isRTL, msgDestParent); }; void doDialog(bool isRTL = false) { diff --git a/PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.cpp b/PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.cpp index 24905119..50eb7bcd 100644 --- a/PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.cpp +++ b/PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.cpp @@ -203,12 +203,12 @@ long PluginsAdminDlg::searchFromCurrentSel(generic_string str2search, bool inWhi return -1; } -void PluginsAdminDlg::create(int dialogID, bool isRTL) +void PluginsAdminDlg::create(int dialogID, bool isRTL, bool msgDestParent) { // get plugin installation path and launch mode (Admin or normal) collectNppCurrentStatusInfos(); - StaticDialog::create(dialogID, isRTL); + StaticDialog::create(dialogID, isRTL, msgDestParent); RECT rect; getClientRect(rect); diff --git a/PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.h b/PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.h index 6b5abdbc..4843b183 100644 --- a/PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.h +++ b/PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.h @@ -97,7 +97,7 @@ public : Window::init(hInst, parent); }; - virtual void create(int dialogID, bool isRTL = false); + virtual void create(int dialogID, bool isRTL = false, bool msgDestParent = true); void doDialog(bool isRTL = false) { if (!isCreated()) diff --git a/PowerEditor/src/WinControls/SplitterContainer/SplitterContainer.cpp b/PowerEditor/src/WinControls/SplitterContainer/SplitterContainer.cpp index 2ef779fd..e6a32f5e 100644 --- a/PowerEditor/src/WinControls/SplitterContainer/SplitterContainer.cpp +++ b/PowerEditor/src/WinControls/SplitterContainer/SplitterContainer.cpp @@ -118,7 +118,7 @@ void SplitterContainer::display(bool toShow) const } -void SplitterContainer::redraw() const +void SplitterContainer::redraw(bool forceUpdate) const { assert(_pWin0 != nullptr); assert(_pWin1 != nullptr); diff --git a/PowerEditor/src/WinControls/SplitterContainer/SplitterContainer.h b/PowerEditor/src/WinControls/SplitterContainer/SplitterContainer.h index 9675b2bd..7a9bd0f1 100644 --- a/PowerEditor/src/WinControls/SplitterContainer/SplitterContainer.h +++ b/PowerEditor/src/WinControls/SplitterContainer/SplitterContainer.h @@ -58,7 +58,7 @@ public : virtual void display(bool toShow = true) const; - virtual void redraw() const; + virtual void redraw(bool forceUpdate = false) const; void setWin0(Window* pWin) {