Include wx/dialog.h according to precompiled headers of wx/wx.h (with other minor...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/cocoa/dialog.mm b/src/cocoa/dialog.mm
index d18483cc868d4b17b052ff37b756fde1f448a4bf..352e7eb9230f4a207cfd22aaa6fce5c61124b184 100644 (file)
--- a/src/cocoa/dialog.mm
+++ b/src/cocoa/dialog.mm
@@ -10,10 +10,12 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+
+#include "wx/dialog.h"
+

 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"

-    #include "wx/dialog.h"

     #include "wx/settings.h"
 #endif //WX_PRECOMP
 
     #include "wx/settings.h"
 #endif //WX_PRECOMP
 


@@ -32,10 +34,10 @@ static wxWindowList wxModalDialogs;
 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
 
 BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
 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)
 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);
 }
     wxLogTrace(wxTRACE_COCOA,wxT("Cancelled!"));
     EndDialog(wxID_CANCEL);
 }

-

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index 5a1693a6a9f12ad33a681168b134f9d9d235b772..56f113c20a7484c97975014f805eb2ac8b82cda7 100644 (file)
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -24,9 +24,10 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/dialog.h"
+

 #ifndef WX_PRECOMP
     #include "wx/button.h"
 #ifndef WX_PRECOMP
     #include "wx/button.h"

-    #include "wx/dialog.h"

     #include "wx/dcclient.h"
     #include "wx/intl.h"
     #include "wx/settings.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 6fb97fb3ba3519caa3e599b5bf4a8038e26b376a..d7261c946572402266211f16c841f53b4273bff1 100644 (file)
--- 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/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"
 #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"
 #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 696d588eef035abcc30e319811a5139ce34c429f..1312d47ff4317004d383f5684fd36aff8e840389 100644 (file)
--- 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/app.h"
     #include "wx/dcclient.h"
     #include "wx/menu.h"

+    #include "wx/dialog.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/dialog.h"

 #include "wx/control.h"
 #if wxUSE_TOOLBAR
     #include "wx/toolbar.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 b6994bebaa5a7e7392544ed605b1d6b0827cc212..f88a1fdba0f24bc54b898da4970bebcdbb11b32e 100644 (file)
--- 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"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/menu.h"

+    #include "wx/dialog.h"

 #endif
 
 #include "wx/notebook.h"
 #endif
 
 #include "wx/notebook.h"

-#include "wx/dialog.h"

 #include "wx/gtk/private.h"
 
 #include <glib.h>
 #include "wx/gtk/private.h"
 
 #include <glib.h>

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index 938ca0d69cc8ae5e85880e8ef9e9bb5ed167bbd6..fc86bc36c57c7005fdf7fb6fbbcd5e4665bdbb49 100644 (file)
--- 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"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/frame.h"

+    #include "wx/dialog.h"

 #endif
 
 #endif
 

-#include "wx/dialog.h"
-

 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
 #endif
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
 #endif

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 4f33dc0d04ad5e59adaf2b0677d2813043eb222d..597c2a224a64b365103f01589c61ded0643701c2 100644 (file)
--- 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/log.h"
     #include "wx/app.h"
     #include "wx/dcclient.h"

+    #include "wx/dialog.h"

 #endif
 
 #endif
 

-#include "wx/dialog.h"

 #include "wx/control.h"
 #include "wx/gtk/private.h"
 #include "wx/timer.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 b0bc36a433b59eafcdf9b00a2ddc93d669a8d3ae..d9f4559a47b73cde46e8d351228394b84166db64 100644 (file)
--- 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/frame.h"
     #include "wx/dcclient.h"
     #include "wx/menu.h"

+    #include "wx/dialog.h"

 #endif
 
 #include "wx/layout.h"
 #endif
 
 #include "wx/layout.h"

-#include "wx/dialog.h"

 #include "wx/msgdlg.h"
 #include "wx/module.h"
 #include "wx/combobox.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 f45088ac37dc326377d8c6ba277ec2f18a9120b8..7efcd849f4292ef6fa9dd747e259f844abc942ad 100644 (file)
--- 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/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"
 #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"
 #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 ce1cfdef46da5371a226296b9ecf554c7aaaf866..3768d3a77ab460a9cda45e682dc6c6dfa9a6d823 100644 (file)
--- 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/app.h"
     #include "wx/dcclient.h"
     #include "wx/menu.h"

+    #include "wx/dialog.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/dialog.h"

 #include "wx/control.h"
 #if wxUSE_TOOLBAR
     #include "wx/toolbar.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 10cf8bbe39cd1051a831fa5bb83a98be832761e0..0b03d0d3043015107926613b716afc9287d48c71 100644 (file)
--- 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"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/menu.h"

+    #include "wx/dialog.h"

 #endif
 
 #include "wx/notebook.h"
 #endif
 
 #include "wx/notebook.h"

-#include "wx/dialog.h"

 #include "wx/gtk1/private.h"
 
 #include <glib.h>
 #include "wx/gtk1/private.h"
 
 #include <glib.h>

diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp
index 4e355e77a6abaf1f300b656aa609303658024185..f969e6e4d17a2c9dcb6d260118f78e6b7ecfc250 100644 (file)
--- 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"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/frame.h"

+    #include "wx/dialog.h"

 #endif
 
 #endif
 

-#include "wx/dialog.h"
-

 #include "wx/gtk1/private.h"
 #include <gdk/gdkkeysyms.h>
 
 #include "wx/gtk1/private.h"
 #include <gdk/gdkkeysyms.h>
 

diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index 50731776a9f32eaf6cd64911987222ab05bf2e83..217551845462fe2f6c66de61c118fd33974123ca 100644 (file)
--- 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/log.h"
     #include "wx/app.h"
     #include "wx/dcclient.h"

+    #include "wx/dialog.h"

 #endif
 
 #endif
 

-#include "wx/dialog.h"

 #include "wx/control.h"
 #include "wx/gtk1/private.h"
 #include "wx/timer.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 d3b99faf01f715be376ad46860e0fe74cfdaf576..0b6dcb13bbc465c6ce9608eff2e864859f8cae11 100644 (file)
--- 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/frame.h"
     #include "wx/dcclient.h"
     #include "wx/menu.h"

+    #include "wx/dialog.h"

 #endif
 
 #include "wx/layout.h"
 #endif
 
 #include "wx/layout.h"

-#include "wx/dialog.h"

 #include "wx/msgdlg.h"
 #include "wx/module.h"
 #include "wx/combobox.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 3f0b8919f72e5327dc6b02adcfa0b3c36ff0282f..ba0f28d1967babb6358ad39922e80b4857ae845c 100644 (file)
--- 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/palette.h"
     #include "wx/icon.h"
     #include "wx/cursor.h"

+    #include "wx/dialog.h"

 #endif
 
 #include "wx/gdicmn.h"
 #endif
 
 #include "wx/gdicmn.h"

-#include "wx/dialog.h"

 #include "wx/msgdlg.h"
 #include "wx/module.h"
 #include "wx/memory.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 5fa7444139e08f6020232f85f6e8b47e8231285f..8d67b5b55fd981ed33174359e1d4e2920bdcad89 100644 (file)
--- 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/dc.h"
     #include "wx/dcclient.h"
     #include "wx/button.h"

+    #include "wx/dialog.h"

 #endif // WX_PRECOMP
 
 #include "wx/notebook.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/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"
 #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 ec2ef163c554cd153d687f43743833939d5d12c6..baa975e0e640912884d4780d275d8c77d0888fa6 100644 (file)
--- a/src/mac/carbon/dirdlg.cpp
+++ b/src/mac/carbon/dirdlg.cpp
@@ -17,10 +17,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"

+    #include "wx/dialog.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/dialog.h"
-

 #include "wx/cmndata.h"
 #include "wx/filename.h"
 
 #include "wx/cmndata.h"
 #include "wx/filename.h"
 

diff --git a/src/mac/carbon/filedlg.cpp b/src/mac/carbon/filedlg.cpp
index dcc70f4bdbe7e43df6572303b1562912b2861bb6..14222c20ec37955794d4839a9e9376d181046347 100644 (file)
--- 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/intl.h"
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/dialog.h"

 #endif
 
 #endif
 

-#include "wx/dialog.h"

 #include "wx/tokenzr.h"
 #include "wx/filename.h"
 
 #include "wx/tokenzr.h"
 #include "wx/filename.h"
 

diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp
index 9bcd1d587b99dacb626cda0f9a6587169c47d225..d4462b59b0268f7cf59d43f73c8eb79cf6dbc831 100644 (file)
--- 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/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"
 #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"
 #include "wx/settings.h"
 
 #include "wx/mac/uma.h"

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 64658395c027cfb3f16459863ef55980cf28d941..7b0f9018f2ba22273d6455f041d98f30ac71db2b 100644 (file)
--- 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/dcclient.h"
     #include "wx/button.h"
     #include "wx/menu.h"

+    #include "wx/dialog.h"

 #endif
 
 #include "wx/layout.h"
 #endif
 
 #include "wx/layout.h"

-#include "wx/dialog.h"

 #include "wx/scrolbar.h"
 #include "wx/statbox.h"
 #include "wx/settings.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 dd8817b49a4e075595fc6fef3479948e3f3d77d2..2093f36cce2ff30c3c05e970bbf8f75961950035 100644 (file)
--- 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/palette.h"
     #include "wx/icon.h"
     #include "wx/cursor.h"

+    #include "wx/dialog.h"

 #endif
 
 #include "wx/gdicmn.h"
 #endif
 
 #include "wx/gdicmn.h"

-#include "wx/dialog.h"

 #include "wx/msgdlg.h"
 #include "wx/module.h"
 #include "wx/memory.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 1599c395c5bb5c110b98e5d71b0a3e03855a79b7..07c5a659324733245344976bc37630b5523ac0c7 100644 (file)
--- 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/dc.h"
     #include "wx/dcclient.h"
     #include "wx/button.h"

+    #include "wx/dialog.h"

 #endif // WX_PRECOMP
 
 #include "wx/notebook.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/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"
 #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 b9ee11f0b33c33c98690335a704c8809dafb09b1..2eafc1cbf5fa90f9f62d7cd83241b26e0169ffb1 100644 (file)
--- a/src/mac/classic/dirdlg.cpp
+++ b/src/mac/classic/dirdlg.cpp
@@ -19,10 +19,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"

+    #include "wx/dialog.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/dialog.h"
-

 #include "wx/cmndata.h"
 
 #include "wx/mac/private.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 f80b88378e030b7e07133395478d2d1fe50e5b88..27ec563fe170dff8cf79f611765e2b3930bdf25a 100644 (file)
--- 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/intl.h"
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/dialog.h"

 #endif
 
 #endif
 

-#include "wx/dialog.h"

 #include "wx/tokenzr.h"
 #include "wx/filename.h"
 
 #include "wx/tokenzr.h"
 #include "wx/filename.h"
 

diff --git a/src/mac/classic/frame.cpp b/src/mac/classic/frame.cpp
index 4790dafe9889abf759ccf87835fc77fdc2ece2dc..7bd22bb4dc5465f966b62bb10d6b562716aa60c8 100644 (file)
--- 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/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"
 #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"
 #include "wx/settings.h"
 
 #include "wx/mac/uma.h"

diff --git a/src/mac/classic/window.cpp b/src/mac/classic/window.cpp
index cb84142c9aea10cea4f700db4d2dc57b240a68df..9898f482d91049930f39a0eb23ce357c55b1d9ad 100644 (file)
--- 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/dcclient.h"
     #include "wx/button.h"
     #include "wx/menu.h"

+    #include "wx/dialog.h"

 #endif
 
 #include "wx/layout.h"
 #endif
 
 #include "wx/layout.h"

-#include "wx/dialog.h"

 #include "wx/listbox.h"
 #include "wx/scrolbar.h"
 #include "wx/statbox.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 c34f333ba5b55d8861f47912814994e432c92070..e36a8017d71249f1fc2382be924a697b1fd3faef 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -24,8 +24,9 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/dialog.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/dialog.h"

     #include "wx/utils.h"
     #include "wx/frame.h"
     #include "wx/app.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 32feb90cac49d5de9ae809f9e58efda5d5b7917d..50fa18cacf695e125946afb6e7e58727a9f79129 100644 (file)
--- a/src/univ/dialog.cpp
+++ b/src/univ/dialog.cpp
@@ -21,8 +21,9 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/dialog.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/dialog.h"

     #include "wx/utils.h"
     #include "wx/app.h"
 #endif
     #include "wx/utils.h"
     #include "wx/app.h"
 #endif


@@ -214,7 +215,7 @@ void wxDialog::EndModal(int retCode)
     }
 
     m_isShowingModal = false;
     }
 
     m_isShowingModal = false;

-    
+

     m_eventLoop->Exit();
 
     Show(false);
     m_eventLoop->Exit();
 
     Show(false);

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 9554bbd7e203de5a3d256fd94314e44f3d086b5b..31af47478f74ed724d832eb1716e5dd7d6381eef 100644 (file)
--- 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/utils.h"
     #include "wx/frame.h"
     #include "wx/icon.h"

+    #include "wx/dialog.h"

 #endif
 
 #include "wx/gdicmn.h"
 #endif
 
 #include "wx/gdicmn.h"

-#include "wx/dialog.h"

 #include "wx/module.h"
 #include "wx/memory.h"
 #include "wx/evtloop.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 54979806398664bbd8a86ea96b7a3f1f17c13e6b..8231d415ae467346ef95f0a119da1eca81ddee69 100644 (file)
--- 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/dcclient.h"
     #include "wx/button.h"
     #include "wx/menu.h"

+    #include "wx/dialog.h"

 #endif
 
 #include "wx/layout.h"
 #endif
 
 #include "wx/layout.h"

-#include "wx/dialog.h"

 #include "wx/listbox.h"
 #include "wx/settings.h"
 #include "wx/msgdlg.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 704ac90abf5e4df5dc6051787b88b7f50f2d8d53..cd50f4a96cc561c9f646748fa7dbde451b282a85 100644 (file)
--- 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/intl.h"
     #include "wx/log.h"
     #include "wx/frame.h"

+    #include "wx/dialog.h"

 #endif
 
 #endif
 

-#include "wx/dialog.h"
-

 IMPLEMENT_DYNAMIC_CLASS(wxDialogXmlHandler, wxXmlResourceHandler)
 
 wxDialogXmlHandler::wxDialogXmlHandler() : wxXmlResourceHandler()
 IMPLEMENT_DYNAMIC_CLASS(wxDialogXmlHandler, wxXmlResourceHandler)
 
 wxDialogXmlHandler::wxDialogXmlHandler() : wxXmlResourceHandler()

diff --git a/src/xrc/xh_frame.cpp b/src/xrc/xh_frame.cpp
index a10f0d24cf605237a781222c44532dcb6871c112..892a9e38aa8cc2d98d4b8b16ff258ef762313c25 100644 (file)
--- 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/intl.h"
     #include "wx/log.h"
     #include "wx/frame.h"

+    #include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE

 #endif
 
 #endif
 

-#include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE
-

 IMPLEMENT_DYNAMIC_CLASS(wxFrameXmlHandler, wxXmlResourceHandler)
 
 wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler()
 IMPLEMENT_DYNAMIC_CLASS(wxFrameXmlHandler, wxXmlResourceHandler)
 
 wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler()

diff --git a/src/xrc/xh_mdi.cpp b/src/xrc/xh_mdi.cpp
index 35c9cae13ad159eedb3e328852e30f89d203dff2..4cc381ec7e48e4eb697dc11d407080c5a38981f9 100644 (file)
--- 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"
 #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"
 #endif
 
 #include "wx/mdi.h"

-#include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE

 
 IMPLEMENT_DYNAMIC_CLASS(wxMdiXmlHandler, wxXmlResourceHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxMdiXmlHandler, wxXmlResourceHandler)
 

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index 238bda8e31bbcdcf27e45433d843cf98cc54344b..bdf49556c5bda26f937d332b7c4bfeadde3b6881 100644 (file)
--- 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/log.h"
     #include "wx/panel.h"
     #include "wx/frame.h"

+    #include "wx/dialog.h"

 #endif
 
 #ifndef __WXWINCE__
     #include <locale.h>
 #endif
 
 #endif
 
 #ifndef __WXWINCE__
     #include <locale.h>
 #endif
 

-#include "wx/dialog.h"

 #include "wx/wfstream.h"
 #include "wx/filesys.h"
 #include "wx/filename.h"
 #include "wx/wfstream.h"
 #include "wx/filesys.h"
 #include "wx/filename.h"