Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable main window when showing msgbox in wxSafeShowMessage()

Browse Source 
Pass correct parent HWND to ::MessageBox() in order to disable the
window while the message box is shown, as this function is supposed to
be similar to modal wxMessageBox() and it was unexpected that the
application could be reentered via the event handlers from inside it.

This required adding wxAppTraits::GetMainHWND() in order to only use the
HWND in GUI applications from the function defined in non-GUI code.
This commit is contained in:
Vadim Zeitlin
2021-03-07 15:37:35 +01:00
parent 9073221584
commit 39883a270a
4 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/msw/apptrait.h
View File

@@ -30,6 +30,7 @@ public:
#endif // wxUSE_THREADS
virtual bool CanUseStderr() wxOVERRIDE { return true; }
virtual bool WriteToStderr(const wxString& text) wxOVERRIDE;
virtual WXHWND GetMainHWND() const wxOVERRIDE { return NULL; }
};
#if wxUSE_GUI
@@ -55,6 +56,7 @@ public:
virtual bool CanUseStderr() wxOVERRIDE;
virtual bool WriteToStderr(const wxString& text) wxOVERRIDE;
virtual WXHWND GetMainHWND() const wxOVERRIDE;
};
#elif defined(__WXGTK__)
@@ -85,6 +87,7 @@ public:
virtual bool CanUseStderr() { return false; }
virtual bool WriteToStderr(const wxString& WXUNUSED(text)) { return false; }
virtual WXHWND GetMainHWND() const wxOVERRIDE { return NULL; }
};
#elif defined(__WXQT__)
@@ -110,6 +113,7 @@ public:
virtual bool CanUseStderr() { return false; }
virtual bool WriteToStderr(const wxString&) { return false; }
virtual WXHWND GetMainHWND() const wxOVERRIDE { return NULL; }
};
#endif