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

@@ -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
 
@@ -240,4 +242,3 @@ void wxDialog::OnCancel(wxCommandEvent& event)
     wxLogTrace(wxTRACE_COCOA,wxT("Cancelled!"));
     EndDialog(wxID_CANCEL);
 }
-

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"

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"

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"

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 <glib.h>

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

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"

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"

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"

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"

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 <glib.h>

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 <gdk/gdkkeysyms.h>
 

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"

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"

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"

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"

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"
 

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"
 

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"

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"

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"

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"

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"

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"
 

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"

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"

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"

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

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"

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"

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()

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()

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)
 

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 <locale.h>
 #endif
 
-#include "wx/dialog.h"
 #include "wx/wfstream.h"
 #include "wx/filesys.h"
 #include "wx/filename.h"