From fdf565feca722eddb84168a95dbef329ba23d719 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Mon, 22 May 2006 20:54:04 +0000 Subject: [PATCH] Include wx/dialog.h according to precompiled headers of wx/wx.h (with other minor cleaning). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/cocoa/dialog.mm | 13 +++++++------ src/common/dlgcmn.cpp | 3 ++- src/gtk/app.cpp | 2 +- src/gtk/frame.cpp | 2 +- src/gtk/mdi.cpp | 2 +- src/gtk/radiobox.cpp | 3 +-- src/gtk/toplevel.cpp | 2 +- src/gtk/window.cpp | 2 +- src/gtk1/app.cpp | 2 +- src/gtk1/frame.cpp | 2 +- src/gtk1/mdi.cpp | 2 +- src/gtk1/radiobox.cpp | 3 +-- src/gtk1/toplevel.cpp | 2 +- src/gtk1/window.cpp | 2 +- src/mac/carbon/app.cpp | 2 +- src/mac/carbon/control.cpp | 2 +- src/mac/carbon/dirdlg.cpp | 3 +-- src/mac/carbon/filedlg.cpp | 2 +- src/mac/carbon/frame.cpp | 2 +- src/mac/carbon/window.cpp | 2 +- src/mac/classic/app.cpp | 2 +- src/mac/classic/control.cpp | 2 +- src/mac/classic/dirdlg.cpp | 3 +-- src/mac/classic/filedlg.cpp | 2 +- src/mac/classic/frame.cpp | 2 +- src/mac/classic/window.cpp | 2 +- src/msw/dialog.cpp | 3 ++- src/univ/dialog.cpp | 5 +++-- src/x11/app.cpp | 2 +- src/x11/window.cpp | 2 +- src/xrc/xh_dlg.cpp | 3 +-- src/xrc/xh_frame.cpp | 3 +-- src/xrc/xh_mdi.cpp | 2 +- src/xrc/xmlres.cpp | 2 +- 34 files changed, 44 insertions(+), 46 deletions(-) diff --git a/src/cocoa/dialog.mm b/src/cocoa/dialog.mm index d18483cc86..352e7eb923 100644 --- a/src/cocoa/dialog.mm +++ b/src/cocoa/dialog.mm @@ -10,10 +10,12 @@ ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" + +#include "wx/dialog.h" + #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/app.h" - #include "wx/dialog.h" #include "wx/settings.h" #endif //WX_PRECOMP @@ -32,10 +34,10 @@ static wxWindowList wxModalDialogs; IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow) BEGIN_EVENT_TABLE(wxDialog, wxDialogBase) - EVT_BUTTON(wxID_OK, wxDialog::OnOK) - EVT_BUTTON(wxID_APPLY, wxDialog::OnApply) - EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel) - EVT_CLOSE(wxDialog::OnCloseWindow) + EVT_BUTTON(wxID_OK, wxDialog::OnOK) + EVT_BUTTON(wxID_APPLY, wxDialog::OnApply) + EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel) + EVT_CLOSE(wxDialog::OnCloseWindow) END_EVENT_TABLE() WX_IMPLEMENT_COCOA_OWNER(wxDialog,NSPanel,NSWindow,NSWindow) @@ -240,4 +242,3 @@ void wxDialog::OnCancel(wxCommandEvent& event) wxLogTrace(wxTRACE_COCOA,wxT("Cancelled!")); EndDialog(wxID_CANCEL); } - diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp index 5a1693a6a9..56f113c20a 100644 --- a/src/common/dlgcmn.cpp +++ b/src/common/dlgcmn.cpp @@ -24,9 +24,10 @@ #pragma hdrstop #endif +#include "wx/dialog.h" + #ifndef WX_PRECOMP #include "wx/button.h" - #include "wx/dialog.h" #include "wx/dcclient.h" #include "wx/intl.h" #include "wx/settings.h" diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 6fb97fb3ba..d7261c9465 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -22,13 +22,13 @@ #include "wx/intl.h" #include "wx/log.h" #include "wx/utils.h" + #include "wx/dialog.h" #endif #include "wx/gdicmn.h" #include "wx/memory.h" #include "wx/font.h" #include "wx/settings.h" -#include "wx/dialog.h" #include "wx/msgdlg.h" #include "wx/file.h" #include "wx/filename.h" diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index 696d588eef..1312d47ff4 100644 --- a/src/gtk/frame.cpp +++ b/src/gtk/frame.cpp @@ -24,9 +24,9 @@ #include "wx/app.h" #include "wx/dcclient.h" #include "wx/menu.h" + #include "wx/dialog.h" #endif // WX_PRECOMP -#include "wx/dialog.h" #include "wx/control.h" #if wxUSE_TOOLBAR #include "wx/toolbar.h" diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp index b6994bebaa..f88a1fdba0 100644 --- a/src/gtk/mdi.cpp +++ b/src/gtk/mdi.cpp @@ -17,10 +17,10 @@ #ifndef WX_PRECOMP #include "wx/intl.h" #include "wx/menu.h" + #include "wx/dialog.h" #endif #include "wx/notebook.h" -#include "wx/dialog.h" #include "wx/gtk/private.h" #include diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp index 938ca0d69c..fc86bc36c5 100644 --- a/src/gtk/radiobox.cpp +++ b/src/gtk/radiobox.cpp @@ -17,10 +17,9 @@ #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/frame.h" + #include "wx/dialog.h" #endif -#include "wx/dialog.h" - #if wxUSE_TOOLTIPS #include "wx/tooltip.h" #endif diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp index 4f33dc0d04..597c2a224a 100644 --- a/src/gtk/toplevel.cpp +++ b/src/gtk/toplevel.cpp @@ -28,9 +28,9 @@ #include "wx/log.h" #include "wx/app.h" #include "wx/dcclient.h" + #include "wx/dialog.h" #endif -#include "wx/dialog.h" #include "wx/control.h" #include "wx/gtk/private.h" #include "wx/timer.h" diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index b0bc36a433..d9f4559a47 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -24,10 +24,10 @@ #include "wx/frame.h" #include "wx/dcclient.h" #include "wx/menu.h" + #include "wx/dialog.h" #endif #include "wx/layout.h" -#include "wx/dialog.h" #include "wx/msgdlg.h" #include "wx/module.h" #include "wx/combobox.h" diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index f45088ac37..7efcd849f4 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -22,13 +22,13 @@ #include "wx/intl.h" #include "wx/log.h" #include "wx/utils.h" + #include "wx/dialog.h" #endif #include "wx/gdicmn.h" #include "wx/memory.h" #include "wx/font.h" #include "wx/settings.h" -#include "wx/dialog.h" #include "wx/msgdlg.h" #include "wx/file.h" #include "wx/filename.h" diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp index ce1cfdef46..3768d3a77a 100644 --- a/src/gtk1/frame.cpp +++ b/src/gtk1/frame.cpp @@ -24,9 +24,9 @@ #include "wx/app.h" #include "wx/dcclient.h" #include "wx/menu.h" + #include "wx/dialog.h" #endif // WX_PRECOMP -#include "wx/dialog.h" #include "wx/control.h" #if wxUSE_TOOLBAR #include "wx/toolbar.h" diff --git a/src/gtk1/mdi.cpp b/src/gtk1/mdi.cpp index 10cf8bbe39..0b03d0d304 100644 --- a/src/gtk1/mdi.cpp +++ b/src/gtk1/mdi.cpp @@ -17,10 +17,10 @@ #ifndef WX_PRECOMP #include "wx/intl.h" #include "wx/menu.h" + #include "wx/dialog.h" #endif #include "wx/notebook.h" -#include "wx/dialog.h" #include "wx/gtk1/private.h" #include diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp index 4e355e77a6..f969e6e4d1 100644 --- a/src/gtk1/radiobox.cpp +++ b/src/gtk1/radiobox.cpp @@ -17,10 +17,9 @@ #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/frame.h" + #include "wx/dialog.h" #endif -#include "wx/dialog.h" - #include "wx/gtk1/private.h" #include diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp index 50731776a9..2175518454 100644 --- a/src/gtk1/toplevel.cpp +++ b/src/gtk1/toplevel.cpp @@ -28,9 +28,9 @@ #include "wx/log.h" #include "wx/app.h" #include "wx/dcclient.h" + #include "wx/dialog.h" #endif -#include "wx/dialog.h" #include "wx/control.h" #include "wx/gtk1/private.h" #include "wx/timer.h" diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index d3b99faf01..0b6dcb13bb 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -24,10 +24,10 @@ #include "wx/frame.h" #include "wx/dcclient.h" #include "wx/menu.h" + #include "wx/dialog.h" #endif #include "wx/layout.h" -#include "wx/dialog.h" #include "wx/msgdlg.h" #include "wx/module.h" #include "wx/combobox.h" diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp index 3f0b8919f7..ba0f28d196 100644 --- a/src/mac/carbon/app.cpp +++ b/src/mac/carbon/app.cpp @@ -27,10 +27,10 @@ #include "wx/palette.h" #include "wx/icon.h" #include "wx/cursor.h" + #include "wx/dialog.h" #endif #include "wx/gdicmn.h" -#include "wx/dialog.h" #include "wx/msgdlg.h" #include "wx/module.h" #include "wx/memory.h" diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp index 5fa7444139..8d67b5b55f 100644 --- a/src/mac/carbon/control.cpp +++ b/src/mac/carbon/control.cpp @@ -19,6 +19,7 @@ #include "wx/dc.h" #include "wx/dcclient.h" #include "wx/button.h" + #include "wx/dialog.h" #endif // WX_PRECOMP #include "wx/notebook.h" @@ -26,7 +27,6 @@ #include "wx/radiobox.h" #include "wx/spinbutt.h" #include "wx/scrolbar.h" -#include "wx/dialog.h" #include "wx/statbox.h" #include "wx/sizer.h" #include "wx/stattext.h" diff --git a/src/mac/carbon/dirdlg.cpp b/src/mac/carbon/dirdlg.cpp index ec2ef163c5..baa975e0e6 100644 --- a/src/mac/carbon/dirdlg.cpp +++ b/src/mac/carbon/dirdlg.cpp @@ -17,10 +17,9 @@ #ifndef WX_PRECOMP #include "wx/utils.h" + #include "wx/dialog.h" #endif // WX_PRECOMP -#include "wx/dialog.h" - #include "wx/cmndata.h" #include "wx/filename.h" diff --git a/src/mac/carbon/filedlg.cpp b/src/mac/carbon/filedlg.cpp index dcc70f4bdb..14222c20ec 100644 --- a/src/mac/carbon/filedlg.cpp +++ b/src/mac/carbon/filedlg.cpp @@ -17,9 +17,9 @@ #include "wx/intl.h" #include "wx/app.h" #include "wx/utils.h" + #include "wx/dialog.h" #endif -#include "wx/dialog.h" #include "wx/tokenzr.h" #include "wx/filename.h" diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp index 9bcd1d587b..d4462b59b0 100644 --- a/src/mac/carbon/frame.cpp +++ b/src/mac/carbon/frame.cpp @@ -17,12 +17,12 @@ #include "wx/app.h" #include "wx/dcclient.h" #include "wx/menu.h" + #include "wx/dialog.h" #endif // WX_PRECOMP #include "wx/statusbr.h" #include "wx/toolbar.h" #include "wx/menuitem.h" -#include "wx/dialog.h" #include "wx/settings.h" #include "wx/mac/uma.h" diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index 64658395c0..7b0f9018f2 100644 --- a/src/mac/carbon/window.cpp +++ b/src/mac/carbon/window.cpp @@ -23,10 +23,10 @@ #include "wx/dcclient.h" #include "wx/button.h" #include "wx/menu.h" + #include "wx/dialog.h" #endif #include "wx/layout.h" -#include "wx/dialog.h" #include "wx/scrolbar.h" #include "wx/statbox.h" #include "wx/settings.h" diff --git a/src/mac/classic/app.cpp b/src/mac/classic/app.cpp index dd8817b49a..2093f36cce 100644 --- a/src/mac/classic/app.cpp +++ b/src/mac/classic/app.cpp @@ -31,10 +31,10 @@ #include "wx/palette.h" #include "wx/icon.h" #include "wx/cursor.h" + #include "wx/dialog.h" #endif #include "wx/gdicmn.h" -#include "wx/dialog.h" #include "wx/msgdlg.h" #include "wx/module.h" #include "wx/memory.h" diff --git a/src/mac/classic/control.cpp b/src/mac/classic/control.cpp index 1599c395c5..07c5a65932 100644 --- a/src/mac/classic/control.cpp +++ b/src/mac/classic/control.cpp @@ -23,6 +23,7 @@ #include "wx/dc.h" #include "wx/dcclient.h" #include "wx/button.h" + #include "wx/dialog.h" #endif // WX_PRECOMP #include "wx/notebook.h" @@ -30,7 +31,6 @@ #include "wx/radiobox.h" #include "wx/spinbutt.h" #include "wx/scrolbar.h" -#include "wx/dialog.h" #include "wx/statbox.h" #include "wx/sizer.h" #include "wx/stattext.h" diff --git a/src/mac/classic/dirdlg.cpp b/src/mac/classic/dirdlg.cpp index b9ee11f0b3..2eafc1cbf5 100644 --- a/src/mac/classic/dirdlg.cpp +++ b/src/mac/classic/dirdlg.cpp @@ -19,10 +19,9 @@ #ifndef WX_PRECOMP #include "wx/utils.h" + #include "wx/dialog.h" #endif // WX_PRECOMP -#include "wx/dialog.h" - #include "wx/cmndata.h" #include "wx/mac/private.h" diff --git a/src/mac/classic/filedlg.cpp b/src/mac/classic/filedlg.cpp index f80b88378e..27ec563fe1 100644 --- a/src/mac/classic/filedlg.cpp +++ b/src/mac/classic/filedlg.cpp @@ -21,9 +21,9 @@ #include "wx/intl.h" #include "wx/app.h" #include "wx/utils.h" + #include "wx/dialog.h" #endif -#include "wx/dialog.h" #include "wx/tokenzr.h" #include "wx/filename.h" diff --git a/src/mac/classic/frame.cpp b/src/mac/classic/frame.cpp index 4790dafe98..7bd22bb4dc 100644 --- a/src/mac/classic/frame.cpp +++ b/src/mac/classic/frame.cpp @@ -17,12 +17,12 @@ #include "wx/app.h" #include "wx/dcclient.h" #include "wx/menu.h" + #include "wx/dialog.h" #endif // WX_PRECOMP #include "wx/statusbr.h" #include "wx/toolbar.h" #include "wx/menuitem.h" -#include "wx/dialog.h" #include "wx/settings.h" #include "wx/mac/uma.h" diff --git a/src/mac/classic/window.cpp b/src/mac/classic/window.cpp index cb84142c9a..9898f482d9 100644 --- a/src/mac/classic/window.cpp +++ b/src/mac/classic/window.cpp @@ -23,10 +23,10 @@ #include "wx/dcclient.h" #include "wx/button.h" #include "wx/menu.h" + #include "wx/dialog.h" #endif #include "wx/layout.h" -#include "wx/dialog.h" #include "wx/listbox.h" #include "wx/scrolbar.h" #include "wx/statbox.h" diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp index c34f333ba5..e36a8017d7 100644 --- a/src/msw/dialog.cpp +++ b/src/msw/dialog.cpp @@ -24,8 +24,9 @@ #pragma hdrstop #endif +#include "wx/dialog.h" + #ifndef WX_PRECOMP - #include "wx/dialog.h" #include "wx/utils.h" #include "wx/frame.h" #include "wx/app.h" diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp index 32feb90cac..50fa18cacf 100644 --- a/src/univ/dialog.cpp +++ b/src/univ/dialog.cpp @@ -21,8 +21,9 @@ #pragma hdrstop #endif +#include "wx/dialog.h" + #ifndef WX_PRECOMP - #include "wx/dialog.h" #include "wx/utils.h" #include "wx/app.h" #endif @@ -214,7 +215,7 @@ void wxDialog::EndModal(int retCode) } m_isShowingModal = false; - + m_eventLoop->Exit(); Show(false); diff --git a/src/x11/app.cpp b/src/x11/app.cpp index 9554bbd7e2..31af47478f 100644 --- a/src/x11/app.cpp +++ b/src/x11/app.cpp @@ -21,10 +21,10 @@ #include "wx/utils.h" #include "wx/frame.h" #include "wx/icon.h" + #include "wx/dialog.h" #endif #include "wx/gdicmn.h" -#include "wx/dialog.h" #include "wx/module.h" #include "wx/memory.h" #include "wx/evtloop.h" diff --git a/src/x11/window.cpp b/src/x11/window.cpp index 5497980639..8231d415ae 100644 --- a/src/x11/window.cpp +++ b/src/x11/window.cpp @@ -37,10 +37,10 @@ #include "wx/dcclient.h" #include "wx/button.h" #include "wx/menu.h" + #include "wx/dialog.h" #endif #include "wx/layout.h" -#include "wx/dialog.h" #include "wx/listbox.h" #include "wx/settings.h" #include "wx/msgdlg.h" diff --git a/src/xrc/xh_dlg.cpp b/src/xrc/xh_dlg.cpp index 704ac90abf..cd50f4a96c 100644 --- a/src/xrc/xh_dlg.cpp +++ b/src/xrc/xh_dlg.cpp @@ -23,10 +23,9 @@ #include "wx/intl.h" #include "wx/log.h" #include "wx/frame.h" + #include "wx/dialog.h" #endif -#include "wx/dialog.h" - IMPLEMENT_DYNAMIC_CLASS(wxDialogXmlHandler, wxXmlResourceHandler) wxDialogXmlHandler::wxDialogXmlHandler() : wxXmlResourceHandler() diff --git a/src/xrc/xh_frame.cpp b/src/xrc/xh_frame.cpp index a10f0d24cf..892a9e38aa 100644 --- a/src/xrc/xh_frame.cpp +++ b/src/xrc/xh_frame.cpp @@ -23,10 +23,9 @@ #include "wx/intl.h" #include "wx/log.h" #include "wx/frame.h" + #include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE #endif -#include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE - IMPLEMENT_DYNAMIC_CLASS(wxFrameXmlHandler, wxXmlResourceHandler) wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler() diff --git a/src/xrc/xh_mdi.cpp b/src/xrc/xh_mdi.cpp index 35c9cae13a..4cc381ec7e 100644 --- a/src/xrc/xh_mdi.cpp +++ b/src/xrc/xh_mdi.cpp @@ -22,10 +22,10 @@ #ifndef WX_PRECOMP #include "wx/intl.h" #include "wx/log.h" + #include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE #endif #include "wx/mdi.h" -#include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE IMPLEMENT_DYNAMIC_CLASS(wxMdiXmlHandler, wxXmlResourceHandler) diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp index 238bda8e31..bdf49556c5 100644 --- a/src/xrc/xmlres.cpp +++ b/src/xrc/xmlres.cpp @@ -24,13 +24,13 @@ #include "wx/log.h" #include "wx/panel.h" #include "wx/frame.h" + #include "wx/dialog.h" #endif #ifndef __WXWINCE__ #include #endif -#include "wx/dialog.h" #include "wx/wfstream.h" #include "wx/filesys.h" #include "wx/filename.h" -- 2.45.2