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

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

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 3e1167c0f0aeb41ef7d36f6079f266bbb1577647..96b44152cad1a8391d5368415efba7cf5fb05a98 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -26,6 +26,8 @@
 
 #if wxUSE_DOC_VIEW_ARCHITECTURE
 
 
 #if wxUSE_DOC_VIEW_ARCHITECTURE
 

+#include "wx/docview.h"
+

 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/string.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/filedlg.h"
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/msgdlg.h"

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


@@ -54,9 +57,7 @@
     #include "wx/printdlg.h"
 #endif
 
     #include "wx/printdlg.h"
 #endif
 

-#include "wx/msgdlg.h"

 #include "wx/choicdlg.h"
 #include "wx/choicdlg.h"

-#include "wx/docview.h"

 #include "wx/confbase.h"
 #include "wx/file.h"
 #include "wx/cmdproc.h"
 #include "wx/confbase.h"
 #include "wx/file.h"
 #include "wx/cmdproc.h"

diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index 622e38279aab4ee7d8b278400bab189eb92df85a..b0ba68445bcb68d854b6c121e953ba9e94051e84 100644 (file)
--- a/src/common/fontmap.cpp
+++ b/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:
 // Purpose:     wxFontMapper class
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -26,10 +26,13 @@
 
 #if wxUSE_FONTMAP
 
 
 #if wxUSE_FONTMAP
 

+#include "wx/fontmap.h"
+

 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/log.h"
     #include "wx/intl.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
 #endif // PCH
 
 #if wxUSE_CONFIG


@@ -41,10 +44,8 @@
   #include  "wx/msw/winundef.h"
 #endif
 
   #include  "wx/msw/winundef.h"
 #endif
 

-#include "wx/fontmap.h"

 #include "wx/fmappriv.h"
 #include "wx/fontutil.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"
 #include "wx/fontdlg.h"
 #include "wx/choicdlg.h"
 #include "wx/encinfo.h"

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index fc98942d444f47600ffa1e633e8168b00fa46ef1..ca26e8cc8045c9018dd073046b0c7412d8d695a8 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -28,11 +28,11 @@
     #include "wx/button.h"
     #include "wx/icon.h"
     #include "wx/settings.h"
     #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"
 #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"
 #include "wx/textctrl.h"
 #include "wx/textdlg.h"
 #include "wx/filefn.h"

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 31790cceb82086b4490d35f85dac2b60f80f4386..d424aa08125d88a638b15419867d5d8021f16aaf 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -13,7 +13,7 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_FILEDLG
 #endif
 
 #if wxUSE_FILEDLG


@@ -28,6 +28,7 @@
     #include "wx/intl.h"
     #include "wx/settings.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/settings.h"
     #include "wx/log.h"

+    #include "wx/msgdlg.h"

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


@@ -36,7 +37,6 @@
 #include "wx/checkbox.h"
 #include "wx/stattext.h"
 #include "wx/longlong.h"
 #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"
 #include "wx/sizer.h"
 #include "wx/bmpbuttn.h"
 #include "wx/tokenzr.h"

diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index b7760651303471868a21c852a5956704096ebf73..02e9c0275c9d857fbb2c29f605231c85bd4f485e 100644 (file)
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -60,8 +60,6 @@
     #include "wx/listctrl.h"
     #include "wx/imaglist.h"
     #include "wx/image.h"
     #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
 #endif // wxUSE_LOG_DIALOG/!wxUSE_LOG_DIALOG
 
 #if defined(__MWERKS__) && wxUSE_UNICODE

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index f235b57a3b5796e3af2e9a72c47332bd5339654e..8f26e090f756e345107c0a1932634eb867d6e062 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -24,12 +24,12 @@
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/settings.h"
     #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"
 #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"
 #include "wx/file.h"
 #include "wx/filename.h"
 #include "wx/module.h"

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index 41e7703303b0cbab2eed11bbfac543aa9cfbcc16..13c50895d2af479e7d636ab363e031e12f83fa0f 100644 (file)
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -16,6 +16,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/msgdlg.h"

 #endif
 
 #ifdef __WXGTK24__
 #endif
 
 #ifdef __WXGTK24__


@@ -28,7 +29,6 @@
 #include "wx/filename.h" // wxFilename
 #include "wx/tokenzr.h" // wxStringTokenizer
 #include "wx/filefn.h" // ::wxGetCwd
 #include "wx/filename.h" // wxFilename
 #include "wx/tokenzr.h" // wxStringTokenizer
 #include "wx/filefn.h" // ::wxGetCwd

-#include "wx/msgdlg.h" // wxMessageDialog

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system

diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp
index 66b985019f14f763ada500d7e3ac624b1aedb746..61a204f1e1a8502c6203f4f2aec08b6e8b13067b 100644 (file)
--- a/src/gtk/fontdlg.cpp
+++ b/src/gtk/fontdlg.cpp
@@ -17,10 +17,10 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/utils.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/utils.h"

+    #include "wx/msgdlg.h"

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

-#include "wx/msgdlg.h"

 
 #include "wx/gtk/private.h"
 
 
 #include "wx/gtk/private.h"
 

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index 34dd2bf59dba8d76414e88094fc2b3622e0a811c..c074dcb480ba713f21abbdc538802a8f067823a6 100644 (file)
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -19,6 +19,7 @@
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/panel.h"
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/panel.h"

+    #include "wx/msgdlg.h"

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


@@ -36,8 +37,6 @@
 
 #include <gdk/gdkkeysyms.h>
 
 
 #include <gdk/gdkkeysyms.h>
 

-#include "wx/msgdlg.h"
-

 // ----------------------------------------------------------------------------
 // events
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // events
 // ----------------------------------------------------------------------------

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 72ee7a2c0271743e653925a04d2ad991d99e60bc..4079dc814599f862e27e76de2ed43d0354143abf 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -26,10 +26,10 @@
     #include "wx/menu.h"
     #include "wx/dialog.h"
     #include "wx/settings.h"
     #include "wx/menu.h"
     #include "wx/dialog.h"
     #include "wx/settings.h"

+    #include "wx/msgdlg.h"

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

-#include "wx/msgdlg.h"

 #include "wx/module.h"
 #include "wx/combobox.h"
 
 #include "wx/module.h"
 #include "wx/combobox.h"
 

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index e8ea46b89008f01697be7503c4267568fedc20d8..9981f60a5a262de8e4e50a6a091d58a4918cf17d 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -24,12 +24,12 @@
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/settings.h"
     #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"
 #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"
 #include "wx/file.h"
 #include "wx/filename.h"
 #include "wx/module.h"

diff --git a/src/gtk1/fontdlg.cpp b/src/gtk1/fontdlg.cpp
index 1c39ba5d23243ffc163e7c9d01c97ab1efc78f8b..8b5a91689f1e538f02cac476029eb65e475f3d80 100644 (file)
--- a/src/gtk1/fontdlg.cpp
+++ b/src/gtk1/fontdlg.cpp
@@ -17,10 +17,10 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/utils.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/utils.h"

+    #include "wx/msgdlg.h"

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

-#include "wx/msgdlg.h"

 
 #include "wx/gtk1/private.h"
 
 
 #include "wx/gtk1/private.h"
 

diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp
index a1e152cbe36a36c0280e020829c390262f19e6c7..6d647cc323073a3cc1ccb0a5936f5a259b27c07d 100644 (file)
--- a/src/gtk1/notebook.cpp
+++ b/src/gtk1/notebook.cpp
@@ -19,6 +19,7 @@
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/panel.h"
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/panel.h"

+    #include "wx/msgdlg.h"

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


@@ -30,8 +31,6 @@
 
 #include <gdk/gdkkeysyms.h>
 
 
 #include <gdk/gdkkeysyms.h>
 

-#include "wx/msgdlg.h"
-

 // ----------------------------------------------------------------------------
 // events
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // events
 // ----------------------------------------------------------------------------

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index fe8f36be4290369333b82becadb3fc42fabd374f..f92f405c9f155fcbc111679c348491ed74760e6c 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -26,10 +26,10 @@
     #include "wx/menu.h"
     #include "wx/dialog.h"
     #include "wx/settings.h"
     #include "wx/menu.h"
     #include "wx/dialog.h"
     #include "wx/settings.h"

+    #include "wx/msgdlg.h"

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

-#include "wx/msgdlg.h"

 #include "wx/module.h"
 #include "wx/combobox.h"
 
 #include "wx/module.h"
 #include "wx/combobox.h"
 

diff --git a/src/html/helpdlg.cpp b/src/html/helpdlg.cpp
index 8af3d252e013ef8e4168d8575969294a93580826..ccd65dc032386c48927b947def273a65df6100c5 100644 (file)
--- a/src/html/helpdlg.cpp
+++ b/src/html/helpdlg.cpp
@@ -29,11 +29,8 @@
     #include "wx/statbox.h"
     #include "wx/radiobox.h"
     #include "wx/menu.h"
     #include "wx/statbox.h"
     #include "wx/radiobox.h"
     #include "wx/menu.h"

-#endif // WXPRECOMP
-
-#ifdef __WXMAC__

     #include "wx/msgdlg.h"
     #include "wx/msgdlg.h"

-#endif
+#endif // WXPRECOMP

 
 #include "wx/html/htmlwin.h"
 #include "wx/html/helpdlg.h"
 
 #include "wx/html/htmlwin.h"
 #include "wx/html/helpdlg.h"

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index 3d7e6db098f33c91f175edc109748613d6b4ffda..ff2a96c3892ab9cbfb1f23b5165a63b26eecff48 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -35,11 +35,8 @@
     #include "wx/radiobox.h"
     #include "wx/menu.h"
     #include "wx/settings.h"
     #include "wx/radiobox.h"
     #include "wx/menu.h"
     #include "wx/settings.h"

-#endif // WXPRECOMP
-
-#ifdef __WXMAC__

     #include "wx/msgdlg.h"
     #include "wx/msgdlg.h"

-#endif
+#endif // WXPRECOMP

 
 #include "wx/html/helpfrm.h"
 #include "wx/html/helpctrl.h"
 
 #include "wx/html/helpfrm.h"
 #include "wx/html/helpctrl.h"

diff --git a/src/html/helpwnd.cpp b/src/html/helpwnd.cpp
index e1b0b5228bc0c4253b97b294138e0b216fd9bec4..2c60c696acfeddcd8a243427a1cf22f8dc91505e 100644 (file)
--- a/src/html/helpwnd.cpp
+++ b/src/html/helpwnd.cpp
@@ -35,11 +35,8 @@
     #include "wx/radiobox.h"
     #include "wx/menu.h"
     #include "wx/settings.h"
     #include "wx/radiobox.h"
     #include "wx/menu.h"
     #include "wx/settings.h"

-#endif // WXPRECOMP
-
-#ifdef __WXMAC__

     #include "wx/msgdlg.h"
     #include "wx/msgdlg.h"

-#endif
+#endif // WXPRECOMP

 
 #include "wx/html/helpfrm.h"
 #include "wx/html/helpdlg.h"
 
 #include "wx/html/helpfrm.h"
 #include "wx/html/helpdlg.h"

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index ba0f28d1967babb6358ad39922e80b4857ae845c..a7aeda322175e771f98b2081a29f60dff9c97626 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -28,10 +28,10 @@
     #include "wx/icon.h"
     #include "wx/cursor.h"
     #include "wx/dialog.h"
     #include "wx/icon.h"
     #include "wx/cursor.h"
     #include "wx/dialog.h"

+    #include "wx/msgdlg.h"

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

-#include "wx/msgdlg.h"

 #include "wx/module.h"
 #include "wx/memory.h"
 #include "wx/tooltip.h"
 #include "wx/module.h"
 #include "wx/memory.h"
 #include "wx/tooltip.h"

diff --git a/src/mac/carbon/dcprint.cpp b/src/mac/carbon/dcprint.cpp
index 27a2734309dfb4a3988db57e73d456fc212e90a1..490b0830659ac93e1f322c591b7ae81d22874995 100644 (file)
--- a/src/mac/carbon/dcprint.cpp
+++ b/src/mac/carbon/dcprint.cpp
@@ -21,9 +21,9 @@
 #include "wx/dcprint.h"
 
 #ifndef WX_PRECOMP
 #include "wx/dcprint.h"
 
 #ifndef WX_PRECOMP

+    #include "wx/msgdlg.h"

 #endif
 
 #endif
 

-#include "wx/msgdlg.h"

 #include "wx/math.h"
 #include "wx/mac/uma.h"
 #include "wx/mac/private/print.h"
 #include "wx/math.h"
 #include "wx/mac/uma.h"
 #include "wx/mac/private/print.h"

diff --git a/src/mac/carbon/printdlg.cpp b/src/mac/carbon/printdlg.cpp
index 1417d0e6f095612a53d53afccc3efc033a25a172..598f4e733e3da1745415025aa5620efbea824d2c 100644 (file)
--- a/src/mac/carbon/printdlg.cpp
+++ b/src/mac/carbon/printdlg.cpp
@@ -13,14 +13,15 @@
 
 #if wxUSE_PRINTING_ARCHITECTURE
 
 
 #if wxUSE_PRINTING_ARCHITECTURE
 

+#include "wx/printdlg.h"
+

 #ifndef WXPRECOMP
     #include "wx/object.h"
     #include "wx/dcprint.h"
 #ifndef WXPRECOMP
     #include "wx/object.h"
     #include "wx/dcprint.h"

+    #include "wx/msgdlg.h"

 #endif
 
 #endif
 

-#include "wx/printdlg.h"

 #include "wx/mac/printdlg.h"
 #include "wx/mac/printdlg.h"

-#include "wx/msgdlg.h"

 #include "wx/mac/private/print.h"
 
 
 #include "wx/mac/private/print.h"
 
 

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 70bbef2d7a5d4c419c4ed530048cac8eba262134..42a7d30c28ebc136063f27150e2374020a3b4f1f 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -23,6 +23,7 @@
     #include "wx/button.h"
     #include "wx/menu.h"
     #include "wx/settings.h"
     #include "wx/button.h"
     #include "wx/menu.h"
     #include "wx/settings.h"

+    #include "wx/msgdlg.h"

 #endif
 
 #ifdef __DARWIN__
 #endif
 
 #ifdef __DARWIN__


@@ -32,8 +33,6 @@
     #include <stat.h>
 #endif
 
     #include <stat.h>
 #endif
 

-#include "wx/msgdlg.h"
-

 #if wxUSE_STD_IOSTREAM
     #if wxUSE_IOSTREAMH
         #include <fstream.h>
 #if wxUSE_STD_IOSTREAM
     #if wxUSE_IOSTREAMH
         #include <fstream.h>

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 53905b4949afb273f7a7bb8fe05e7f074f293b43..409bdd8d9606104da8f57a9bc5270ee9cd6322e9 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -25,12 +25,12 @@
     #include "wx/menu.h"
     #include "wx/dialog.h"
     #include "wx/settings.h"
     #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"
 #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"
 #include "wx/tooltip.h"
 #include "wx/statusbr.h"
 #include "wx/menuitem.h"

diff --git a/src/mac/classic/app.cpp b/src/mac/classic/app.cpp
index 2093f36cce2ff30c3c05e970bbf8f75961950035..6670bde5ccea84fae1cf60fb14eaf29fec437101 100644 (file)
--- a/src/mac/classic/app.cpp
+++ b/src/mac/classic/app.cpp
@@ -32,10 +32,10 @@
     #include "wx/icon.h"
     #include "wx/cursor.h"
     #include "wx/dialog.h"
     #include "wx/icon.h"
     #include "wx/cursor.h"
     #include "wx/dialog.h"

+    #include "wx/msgdlg.h"

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

-#include "wx/msgdlg.h"

 #include "wx/module.h"
 #include "wx/memory.h"
 #include "wx/tooltip.h"
 #include "wx/module.h"
 #include "wx/memory.h"
 #include "wx/tooltip.h"

diff --git a/src/mac/classic/dcprint.cpp b/src/mac/classic/dcprint.cpp
index 8d21ba124beba74d39ec6c1d0bccbbe50d875a6c..fb7d386862c32f635f32616df3215f3d154e9759 100644 (file)
--- a/src/mac/classic/dcprint.cpp
+++ b/src/mac/classic/dcprint.cpp
@@ -19,9 +19,9 @@
 #include "wx/dcprint.h"
 
 #ifndef WX_PRECOMP
 #include "wx/dcprint.h"
 
 #ifndef WX_PRECOMP

+    #include "wx/msgdlg.h"

 #endif
 
 #endif
 

-#include "wx/msgdlg.h"

 #include "wx/math.h"
 #include "wx/mac/uma.h"
 #include "wx/mac/private/print.h"
 #include "wx/math.h"
 #include "wx/mac/uma.h"
 #include "wx/mac/private/print.h"

diff --git a/src/mac/classic/printdlg.cpp b/src/mac/classic/printdlg.cpp
index 44d00b882c0866da158769a767279f5d0f334ae8..5928041001fff8d496e896d5c639105b6fa80d61 100644 (file)
--- a/src/mac/classic/printdlg.cpp
+++ b/src/mac/classic/printdlg.cpp
@@ -12,13 +12,14 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // 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"
 #ifndef WX_PRECOMP
     #include "wx/object.h"
     #include "wx/dcprint.h"

+    #include "wx/msgdlg.h"

 #endif
 
 #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.
 #include "wx/mac/private/print.h"
 
 // Use generic page setup dialog: use your own native one if one exists.

diff --git a/src/mac/classic/textctrl.cpp b/src/mac/classic/textctrl.cpp
index 57fc901cab8c2a021b06288e25ebd498331f93d8..aebb686c12dd0d0c382587588307c8b51dc1f27c 100644 (file)
--- a/src/mac/classic/textctrl.cpp
+++ b/src/mac/classic/textctrl.cpp
@@ -25,6 +25,7 @@
     #include "wx/dc.h"
     #include "wx/button.h"
     #include "wx/settings.h"
     #include "wx/dc.h"
     #include "wx/button.h"
     #include "wx/settings.h"

+    #include "wx/msgdlg.h"

 #endif
 
 #ifdef __DARWIN__
 #endif
 
 #ifdef __DARWIN__


@@ -34,8 +35,6 @@
     #include <stat.h>
 #endif
 
     #include <stat.h>
 #endif
 

-#include "wx/msgdlg.h"
-

 #if wxUSE_STD_IOSTREAM
     #if wxUSE_IOSTREAMH
         #include <fstream.h>
 #if wxUSE_STD_IOSTREAM
     #if wxUSE_IOSTREAMH
         #include <fstream.h>

diff --git a/src/mac/classic/window.cpp b/src/mac/classic/window.cpp
index 949b1ee70196c16ca240ef674d1aa2b049075f0a..96cd1cbbb50177709442db0c061e1936f064aa95 100644 (file)
--- a/src/mac/classic/window.cpp
+++ b/src/mac/classic/window.cpp
@@ -25,13 +25,13 @@
     #include "wx/menu.h"
     #include "wx/dialog.h"
     #include "wx/settings.h"
     #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"
 #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"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/tooltip.h"

diff --git a/src/msw/msgdlg.cpp b/src/msw/msgdlg.cpp
index d641c6a3d5a832b6fff150a1717b2c6cc751741d..41cb6a49a82172d28adff80e58f45281565c8a8f 100644 (file)
--- a/src/msw/msgdlg.cpp
+++ b/src/msw/msgdlg.cpp
@@ -16,11 +16,12 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/msgdlg.h"
+

 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/dialog.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"
 #endif
 
 #include "wx/msw/private.h"

diff --git a/src/os2/msgdlg.cpp b/src/os2/msgdlg.cpp
index 7577e564ec2b1b004786c12f527583d4057cfb5e..90d433a0899e89e467eed844723b6cdb479ce82c 100644 (file)
--- a/src/os2/msgdlg.cpp
+++ b/src/os2/msgdlg.cpp
@@ -12,12 +12,13 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // 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"
 #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
 
     #include "wx/math.h"
 #endif
 

diff --git a/src/palmos/progdlg.cpp b/src/palmos/progdlg.cpp
index 0b4c467a4d27b32555d3c402e76b92636c9aaec5..f2432a5450eebc8333806381082da75089f98397 100644 (file)
--- a/src/palmos/progdlg.cpp
+++ b/src/palmos/progdlg.cpp
@@ -13,17 +13,17 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#ifndef WX_PRECOMP
-    #include  "wx/string.h"
-#endif //WX_PRECOMP
-

 #if wxUSE_PROGRESSDLG
 
 #include "wx/progdlg.h"
 #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>
 
 #include <Progress.h>
 #include <SysEvtMgr.h>

diff --git a/src/x11/utils.cpp b/src/x11/utils.cpp
index 8982ec4c0e817b56a0ed2fc144530ec712d78453..ae71bbe8fc797a3c0fed38612cfb1aea96209859 100644 (file)
--- a/src/x11/utils.cpp
+++ b/src/x11/utils.cpp
@@ -30,10 +30,10 @@
     #include "wx/app.h"
     #include "wx/window.h" // for wxTopLevelWindows
     #include "wx/cursor.h"
     #include "wx/app.h"
     #include "wx/window.h" // for wxTopLevelWindows
     #include "wx/cursor.h"

+    #include "wx/msgdlg.h"

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

-#include "wx/msgdlg.h"

 
 #include <ctype.h>
 #include <stdarg.h>
 
 #include <ctype.h>
 #include <stdarg.h>

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index 6a2b1af21795b0454c012938464b7a7817d23e8a..f2b103189ca2051dfcf08492a20520efece50e0a 100644 (file)
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -40,11 +40,11 @@
     #include "wx/dialog.h"
     #include "wx/timer.h"
     #include "wx/settings.h"
     #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"
 #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"
 #include "wx/scrolwin.h"
 #include "wx/scrolbar.h"
 #include "wx/module.h"