Include wx/msgdlg.h according to precompiled headers of wx/wx.h (with other minor cleaning).

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

src/common/docview.cpp

@@ -26,6 +26,8 @@
 
 #if wxUSE_DOC_VIEW_ARCHITECTURE
 
+#include "wx/docview.h"
+
 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/string.h"
@@ -37,6 +39,7 @@
     #include "wx/filedlg.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/msgdlg.h"
 #endif
 
 #include "wx/ffile.h"
@@ -54,9 +57,7 @@
     #include "wx/printdlg.h"
 #endif
 
-#include "wx/msgdlg.h"
 #include "wx/choicdlg.h"
-#include "wx/docview.h"
 #include "wx/confbase.h"
 #include "wx/file.h"
 #include "wx/cmdproc.h"

src/common/fontmap.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        common/fontmap.cpp
+// Name:        src/common/fontmap.cpp
 // Purpose:     wxFontMapper class
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -26,10 +26,13 @@
 
 #if wxUSE_FONTMAP
 
+#include "wx/fontmap.h"
+
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/log.h"
     #include "wx/intl.h"
+    #include "wx/msgdlg.h"
 #endif // PCH
 
 #if wxUSE_CONFIG
@@ -41,10 +44,8 @@
   #include  "wx/msw/winundef.h"
 #endif
 
-#include "wx/fontmap.h"
 #include "wx/fmappriv.h"
 #include "wx/fontutil.h"
-#include "wx/msgdlg.h"
 #include "wx/fontdlg.h"
 #include "wx/choicdlg.h"
 #include "wx/encinfo.h"

src/generic/dirctrlg.cpp

@@ -28,11 +28,11 @@
     #include "wx/button.h"
     #include "wx/icon.h"
     #include "wx/settings.h"
+    #include "wx/msgdlg.h"
 #endif
 
 #include "wx/module.h"
 #include "wx/layout.h"
-#include "wx/msgdlg.h"
 #include "wx/textctrl.h"
 #include "wx/textdlg.h"
 #include "wx/filefn.h"

src/generic/filedlgg.cpp

@@ -13,7 +13,7 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #if wxUSE_FILEDLG
@@ -28,6 +28,7 @@
     #include "wx/intl.h"
     #include "wx/settings.h"
     #include "wx/log.h"
+    #include "wx/msgdlg.h"
 #endif
 
 #include "wx/checkbox.h"
@@ -36,7 +37,6 @@
 #include "wx/checkbox.h"
 #include "wx/stattext.h"
 #include "wx/longlong.h"
-#include "wx/msgdlg.h"
 #include "wx/sizer.h"
 #include "wx/bmpbuttn.h"
 #include "wx/tokenzr.h"

src/generic/logg.cpp

@@ -60,8 +60,6 @@
     #include "wx/listctrl.h"
     #include "wx/imaglist.h"
     #include "wx/image.h"
-#else // !wxUSE_LOG_DIALOG
-    #include "wx/msgdlg.h"
 #endif // wxUSE_LOG_DIALOG/!wxUSE_LOG_DIALOG
 
 #if defined(__MWERKS__) && wxUSE_UNICODE

src/gtk/app.cpp

@@ -24,12 +24,12 @@
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/settings.h"
+    #include "wx/msgdlg.h"
 #endif
 
 #include "wx/gdicmn.h"
 #include "wx/memory.h"
 #include "wx/font.h"
-#include "wx/msgdlg.h"
 #include "wx/file.h"
 #include "wx/filename.h"
 #include "wx/module.h"

src/gtk/filedlg.cpp

@@ -16,6 +16,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
+    #include "wx/msgdlg.h"
 #endif
 
 #ifdef __WXGTK24__
@@ -28,7 +29,6 @@
 #include "wx/filename.h" // wxFilename
 #include "wx/tokenzr.h" // wxStringTokenizer
 #include "wx/filefn.h" // ::wxGetCwd
-#include "wx/msgdlg.h" // wxMessageDialog
 
 //-----------------------------------------------------------------------------
 // idle system

src/gtk/fontdlg.cpp

@@ -17,10 +17,10 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/utils.h"
+    #include "wx/msgdlg.h"
 #endif
 
 #include "wx/fontutil.h"
-#include "wx/msgdlg.h"
 
 #include "wx/gtk/private.h"
 

src/gtk/notebook.cpp

@@ -19,6 +19,7 @@
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/panel.h"
+    #include "wx/msgdlg.h"
 #endif
 
 #include "wx/imaglist.h"
@@ -36,8 +37,6 @@
 
 #include <gdk/gdkkeysyms.h>
 
-#include "wx/msgdlg.h"
-
 // ----------------------------------------------------------------------------
 // events
 // ----------------------------------------------------------------------------

src/gtk/window.cpp

@@ -26,10 +26,10 @@
     #include "wx/menu.h"
     #include "wx/dialog.h"
     #include "wx/settings.h"
+    #include "wx/msgdlg.h"
 #endif
 
 #include "wx/layout.h"
-#include "wx/msgdlg.h"
 #include "wx/module.h"
 #include "wx/combobox.h"
 

src/gtk1/app.cpp

@@ -24,12 +24,12 @@
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/settings.h"
+    #include "wx/msgdlg.h"
 #endif
 
 #include "wx/gdicmn.h"
 #include "wx/memory.h"
 #include "wx/font.h"
-#include "wx/msgdlg.h"
 #include "wx/file.h"
 #include "wx/filename.h"
 #include "wx/module.h"

src/gtk1/fontdlg.cpp

@@ -17,10 +17,10 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/utils.h"
+    #include "wx/msgdlg.h"
 #endif
 
 #include "wx/fontutil.h"
-#include "wx/msgdlg.h"
 
 #include "wx/gtk1/private.h"
 

src/gtk1/notebook.cpp

@@ -19,6 +19,7 @@
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/panel.h"
+    #include "wx/msgdlg.h"
 #endif
 
 #include "wx/imaglist.h"
@@ -30,8 +31,6 @@
 
 #include <gdk/gdkkeysyms.h>
 
-#include "wx/msgdlg.h"
-
 // ----------------------------------------------------------------------------
 // events
 // ----------------------------------------------------------------------------

src/gtk1/window.cpp

@@ -26,10 +26,10 @@
     #include "wx/menu.h"
     #include "wx/dialog.h"
     #include "wx/settings.h"
+    #include "wx/msgdlg.h"
 #endif
 
 #include "wx/layout.h"
-#include "wx/msgdlg.h"
 #include "wx/module.h"
 #include "wx/combobox.h"
 

src/html/helpdlg.cpp

@@ -29,11 +29,8 @@
     #include "wx/statbox.h"
     #include "wx/radiobox.h"
     #include "wx/menu.h"
-#endif // WXPRECOMP
-
-#ifdef __WXMAC__
     #include "wx/msgdlg.h"
-#endif
+#endif // WXPRECOMP
 
 #include "wx/html/htmlwin.h"
 #include "wx/html/helpdlg.h"

src/html/helpfrm.cpp

@@ -35,11 +35,8 @@
     #include "wx/radiobox.h"
     #include "wx/menu.h"
     #include "wx/settings.h"
-#endif // WXPRECOMP
-
-#ifdef __WXMAC__
     #include "wx/msgdlg.h"
-#endif
+#endif // WXPRECOMP
 
 #include "wx/html/helpfrm.h"
 #include "wx/html/helpctrl.h"

src/html/helpwnd.cpp

@@ -35,11 +35,8 @@
     #include "wx/radiobox.h"
     #include "wx/menu.h"
     #include "wx/settings.h"
-#endif // WXPRECOMP
-
-#ifdef __WXMAC__
     #include "wx/msgdlg.h"
-#endif
+#endif // WXPRECOMP
 
 #include "wx/html/helpfrm.h"
 #include "wx/html/helpdlg.h"

src/mac/carbon/app.cpp

@@ -28,10 +28,10 @@
     #include "wx/icon.h"
     #include "wx/cursor.h"
     #include "wx/dialog.h"
+    #include "wx/msgdlg.h"
 #endif
 
 #include "wx/gdicmn.h"
-#include "wx/msgdlg.h"
 #include "wx/module.h"
 #include "wx/memory.h"
 #include "wx/tooltip.h"

src/mac/carbon/dcprint.cpp

@@ -21,9 +21,9 @@
 #include "wx/dcprint.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msgdlg.h"
 #endif
 
-#include "wx/msgdlg.h"
 #include "wx/math.h"
 #include "wx/mac/uma.h"
 #include "wx/mac/private/print.h"

src/mac/carbon/printdlg.cpp

@@ -13,14 +13,15 @@
 
 #if wxUSE_PRINTING_ARCHITECTURE
 
+#include "wx/printdlg.h"
+
 #ifndef WXPRECOMP
     #include "wx/object.h"
     #include "wx/dcprint.h"
+    #include "wx/msgdlg.h"
 #endif
 
-#include "wx/printdlg.h"
 #include "wx/mac/printdlg.h"
-#include "wx/msgdlg.h"
 #include "wx/mac/private/print.h"
 
 

src/mac/carbon/textctrl.cpp

@@ -23,6 +23,7 @@
     #include "wx/button.h"
     #include "wx/menu.h"
     #include "wx/settings.h"
+    #include "wx/msgdlg.h"
 #endif
 
 #ifdef __DARWIN__
@@ -32,8 +33,6 @@
     #include <stat.h>
 #endif
 
-#include "wx/msgdlg.h"
-
 #if wxUSE_STD_IOSTREAM
     #if wxUSE_IOSTREAMH
         #include <fstream.h>

src/mac/carbon/window.cpp

@@ -25,12 +25,12 @@
     #include "wx/menu.h"
     #include "wx/dialog.h"
     #include "wx/settings.h"
+    #include "wx/msgdlg.h"
 #endif
 
 #include "wx/layout.h"
 #include "wx/scrolbar.h"
 #include "wx/statbox.h"
-#include "wx/msgdlg.h"
 #include "wx/tooltip.h"
 #include "wx/statusbr.h"
 #include "wx/menuitem.h"

src/mac/classic/app.cpp

@@ -32,10 +32,10 @@
     #include "wx/icon.h"
     #include "wx/cursor.h"
     #include "wx/dialog.h"
+    #include "wx/msgdlg.h"
 #endif
 
 #include "wx/gdicmn.h"
-#include "wx/msgdlg.h"
 #include "wx/module.h"
 #include "wx/memory.h"
 #include "wx/tooltip.h"

src/mac/classic/dcprint.cpp

@@ -19,9 +19,9 @@
 #include "wx/dcprint.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msgdlg.h"
 #endif
 
-#include "wx/msgdlg.h"
 #include "wx/math.h"
 #include "wx/mac/uma.h"
 #include "wx/mac/private/print.h"

src/mac/classic/printdlg.cpp

@@ -12,13 +12,14 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/printdlg.h"
+
 #ifndef WX_PRECOMP
     #include "wx/object.h"
     #include "wx/dcprint.h"
+    #include "wx/msgdlg.h"
 #endif
 
-#include "wx/printdlg.h"
-#include "wx/msgdlg.h"
 #include "wx/mac/private/print.h"
 
 // Use generic page setup dialog: use your own native one if one exists.

src/mac/classic/textctrl.cpp

@@ -25,6 +25,7 @@
     #include "wx/dc.h"
     #include "wx/button.h"
     #include "wx/settings.h"
+    #include "wx/msgdlg.h"
 #endif
 
 #ifdef __DARWIN__
@@ -34,8 +35,6 @@
     #include <stat.h>
 #endif
 
-#include "wx/msgdlg.h"
-
 #if wxUSE_STD_IOSTREAM
     #if wxUSE_IOSTREAMH
         #include <fstream.h>

src/mac/classic/window.cpp

@@ -25,13 +25,13 @@
     #include "wx/menu.h"
     #include "wx/dialog.h"
     #include "wx/settings.h"
+    #include "wx/msgdlg.h"
 #endif
 
 #include "wx/layout.h"
 #include "wx/listbox.h"
 #include "wx/scrolbar.h"
 #include "wx/statbox.h"
-#include "wx/msgdlg.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/tooltip.h"

src/msw/msgdlg.cpp

@@ -16,11 +16,12 @@
     #pragma hdrstop
 #endif
 
+#include "wx/msgdlg.h"
+
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
-    #include "wx/msgdlg.h"
 #endif
 
 #include "wx/msw/private.h"

src/os2/msgdlg.cpp

@@ -12,12 +12,13 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/msgdlg.h"
+
 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/app.h"
-    #include "wx/msgdlg.h"
     #include "wx/math.h"
 #endif
 

src/palmos/progdlg.cpp

@@ -13,17 +13,17 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-    #include  "wx/string.h"
-#endif //WX_PRECOMP
-
 #if wxUSE_PROGRESSDLG
 
 #include "wx/progdlg.h"
-#include "wx/msgdlg.h"
+
+#ifndef WX_PRECOMP
+    #include  "wx/string.h"
+    #include "wx/msgdlg.h"
+#endif //WX_PRECOMP
 
 #include <Progress.h>
 #include <SysEvtMgr.h>

src/x11/utils.cpp

@@ -30,10 +30,10 @@
     #include "wx/app.h"
     #include "wx/window.h" // for wxTopLevelWindows
     #include "wx/cursor.h"
+    #include "wx/msgdlg.h"
 #endif
 
 #include "wx/apptrait.h"
-#include "wx/msgdlg.h"
 
 #include <ctype.h>
 #include <stdarg.h>

src/x11/window.cpp

@@ -40,11 +40,11 @@
     #include "wx/dialog.h"
     #include "wx/timer.h"
     #include "wx/settings.h"
+    #include "wx/msgdlg.h"
 #endif
 
 #include "wx/layout.h"
 #include "wx/listbox.h"
-#include "wx/msgdlg.h"
 #include "wx/scrolwin.h"
 #include "wx/scrolbar.h"
 #include "wx/module.h"