X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/31df756d7447e51c1a42c3a72a8e16f0d798e7b1..957eca2f20bedbd7ca13cc7128b2160ee81a4104:/src/motif/dialog.cpp diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp index cc38234f56..22dc5a65f8 100644 --- a/src/motif/dialog.cpp +++ b/src/motif/dialog.cpp @@ -20,8 +20,12 @@ #endif #include "wx/dialog.h" -#include "wx/utils.h" -#include "wx/app.h" + +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/utils.h" +#endif + #include "wx/settings.h" #include "wx/evtloop.h" @@ -69,12 +73,12 @@ extern wxList wxPendingDelete; IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow) BEGIN_EVENT_TABLE(wxDialog, wxTopLevelWindow) - EVT_BUTTON(wxID_OK, wxDialog::OnOK) - EVT_BUTTON(wxID_APPLY, wxDialog::OnApply) - EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel) - EVT_CHAR_HOOK(wxDialog::OnCharHook) - EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged) - EVT_CLOSE(wxDialog::OnCloseWindow) + EVT_BUTTON(wxID_OK, wxDialog::OnOK) + EVT_BUTTON(wxID_APPLY, wxDialog::OnApply) + EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel) + EVT_CHAR_HOOK(wxDialog::OnCharHook) + EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged) + EVT_CLOSE(wxDialog::OnCloseWindow) END_EVENT_TABLE() @@ -319,8 +323,6 @@ bool wxDialog::Show( bool show ) // Shows a dialog modally, returning a return code int wxDialog::ShowModal() { - m_windowStyle |= wxDIALOG_MODAL; - Show(true); // after the event loop ran, the widget might already have been destroyed