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

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

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index ca26e8cc8045c9018dd073046b0c7412d8d695a8..2af122dc8f9a012f2ac6287abb3a4a572748bd06 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -29,6 +29,7 @@
     #include "wx/icon.h"
     #include "wx/settings.h"
     #include "wx/msgdlg.h"
     #include "wx/icon.h"
     #include "wx/settings.h"
     #include "wx/msgdlg.h"

+    #include "wx/cmndata.h"

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


@@ -36,7 +37,6 @@
 #include "wx/textctrl.h"
 #include "wx/textdlg.h"
 #include "wx/filefn.h"
 #include "wx/textctrl.h"
 #include "wx/textdlg.h"
 #include "wx/filefn.h"

-#include "wx/cmndata.h"

 #include "wx/gdicmn.h"
 #include "wx/imaglist.h"
 #include "wx/sizer.h"
 #include "wx/gdicmn.h"
 #include "wx/imaglist.h"
 #include "wx/sizer.h"

diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp
index 2647cde02b541be37a5eb1e2013e48de196f67b3..d61aa8cfc019531b0091a9a66f4f1835d4f35d70 100644 (file)
--- a/src/generic/fontdlgg.cpp
+++ b/src/generic/fontdlgg.cpp
@@ -31,12 +31,12 @@
     #include "wx/checkbox.h"
     #include "wx/intl.h"
     #include "wx/settings.h"
     #include "wx/checkbox.h"
     #include "wx/intl.h"
     #include "wx/settings.h"

+    #include "wx/cmndata.h"

 #endif
 
 #include <string.h>
 #include <stdlib.h>
 
 #endif
 
 #include <string.h>
 #include <stdlib.h>
 

-#include "wx/cmndata.h"

 #include "wx/sizer.h"
 #include "wx/fontdlg.h"
 #include "wx/generic/fontdlgg.h"
 #include "wx/sizer.h"
 #include "wx/fontdlg.h"
 #include "wx/generic/fontdlgg.h"

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index b88103b6712881df22c5e4720c4160adab9fa193..6c9e102f31550ed6ee0e7f79c3e3d5366131ba09 100644 (file)
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -24,10 +24,10 @@
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/settings.h"
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/settings.h"

+    #include "wx/cmndata.h"

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

-#include "wx/cmndata.h"

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

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index b0cb27143e26f0b2bdb25fec93fb8e97156b81e4..bc6ee6a3c8911f3075879a4b70d9fcb680067e90 100644 (file)
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -13,7 +13,10 @@
 
 #include "wx/settings.h"
 
 
 #include "wx/settings.h"
 

-#include "wx/cmndata.h"
+#ifndef WX_PRECOMP
+    #include "wx/cmndata.h"
+#endif
+

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

diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index 32c0aa064526437ddafdcc60e93464616aeb4dc6..a926b22363e796fc5323ec0201588a971b480076 100644 (file)
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -23,10 +23,10 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/settings.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/settings.h"

+    #include "wx/cmndata.h"

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

-#include "wx/cmndata.h"

 #include "wx/utils.h"
 #include "wx/gdicmn.h"
 #include "wx/tokenzr.h"
 #include "wx/utils.h"
 #include "wx/gdicmn.h"
 #include "wx/tokenzr.h"

diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp
index 5943aa5b0a45c345a89a8ea093990c43b6644b4f..a5348ebaad86953ff7a1d6d98592b46e00f5a64f 100644 (file)
--- a/src/gtk1/settings.cpp
+++ b/src/gtk1/settings.cpp
@@ -13,7 +13,10 @@
 
 #include "wx/settings.h"
 
 
 #include "wx/settings.h"
 

-#include "wx/cmndata.h"
+#ifndef WX_PRECOMP
+    #include "wx/cmndata.h"
+#endif
+

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

diff --git a/src/mac/carbon/dirdlg.cpp b/src/mac/carbon/dirdlg.cpp
index baa975e0e640912884d4780d275d8c77d0888fa6..fedf03ccaeb4f0421b7744d984c16f0b547c8217 100644 (file)
--- a/src/mac/carbon/dirdlg.cpp
+++ b/src/mac/carbon/dirdlg.cpp
@@ -18,9 +18,9 @@
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dialog.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dialog.h"

+    #include "wx/cmndata.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/cmndata.h"

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

diff --git a/src/mac/carbon/fontdlgosx.mm b/src/mac/carbon/fontdlgosx.mm
index fe90214386947d784a1db4db81e971da2a74772c..d863f7568919087d0c57f3ee001a06a9f6a51666 100644 (file)
--- a/src/mac/carbon/fontdlgosx.mm
+++ b/src/mac/carbon/fontdlgosx.mm
@@ -24,9 +24,9 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/cmndata.h"

 #endif
 
 #endif
 

-#include "wx/cmndata.h"

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

diff --git a/src/mac/classic/dirdlg.cpp b/src/mac/classic/dirdlg.cpp
index 2eafc1cbf5fa90f9f62d7cd83241b26e0169ffb1..ad199358fb594fc4ac40aaf03600862332b01852 100644 (file)
--- a/src/mac/classic/dirdlg.cpp
+++ b/src/mac/classic/dirdlg.cpp
@@ -20,10 +20,9 @@
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dialog.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dialog.h"

+    #include "wx/cmndata.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/cmndata.h"
-

 #include "wx/mac/private.h"
 
 #ifdef __DARWIN__
 #include "wx/mac/private.h"
 
 #ifdef __DARWIN__

diff --git a/src/mac/classic/fontdlg.cpp b/src/mac/classic/fontdlg.cpp
index b4dd977da0eee44d0afed8c048cd48137814b58c..ac80e0ed51c4d047d1940cfca953497c73c4224a 100644 (file)
--- a/src/mac/classic/fontdlg.cpp
+++ b/src/mac/classic/fontdlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        fontdlg.cpp
+// Name:        src/mac/classic/fontdlg.cpp

 // Purpose:     wxFontDialog class. NOTE: you can use the generic class
 //              if you wish, instead of implementing this.
 // Author:      Stefan Csomor
 // Purpose:     wxFontDialog class. NOTE: you can use the generic class
 //              if you wish, instead of implementing this.
 // Author:      Stefan Csomor


@@ -7,11 +7,16 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+#include "wx/wxprec.h"
+

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

-#include "wx/cmndata.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/cmndata.h"
+#endif

 
 IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
 


@@ -37,7 +42,7 @@ bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data)
 
     // TODO: you may need to do dialog creation here, unless it's
     // done in ShowModal.
 
     // TODO: you may need to do dialog creation here, unless it's
     // done in ShowModal.

-    return TRUE;
+    return true;

 }
 
 int wxFontDialog::ShowModal()
 }
 
 int wxFontDialog::ShowModal()


@@ -45,4 +50,3 @@ int wxFontDialog::ShowModal()
     // TODO: show (maybe create) the dialog
     return wxID_CANCEL;
 }
     // TODO: show (maybe create) the dialog
     return wxID_CANCEL;
 }

-

diff --git a/src/mgl/font.cpp b/src/mgl/font.cpp
index 1798b69d062456a1ca6307bf27799616ea4e9b57..2cce8212f1333712be208f42e9a07f52d9762085 100644 (file)
--- a/src/mgl/font.cpp
+++ b/src/mgl/font.cpp
@@ -27,10 +27,10 @@
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/settings.h"
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/settings.h"

+    #include "wx/cmndata.h"

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

-#include "wx/cmndata.h"

 #include "wx/gdicmn.h"
 #include "wx/tokenzr.h"
 #include "wx/mgl/private.h"
 #include "wx/gdicmn.h"
 #include "wx/tokenzr.h"
 #include "wx/mgl/private.h"

diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp
index d425d89bc67c172df75d9bb62e0f29ef4b085050..4282b46c2b59382fa86735e0cb6491918851e299 100644 (file)
--- a/src/msw/colordlg.cpp
+++ b/src/msw/colordlg.cpp
@@ -24,19 +24,20 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_COLOURDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
+
+#include "wx/colordlg.h"
+

 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/colour.h"
     #include "wx/gdicmn.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/colour.h"
     #include "wx/gdicmn.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"

+    #include "wx/cmndata.h"

 #endif
 
 #endif
 

-#if wxUSE_COLOURDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
-

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

-#include "wx/colordlg.h"
-#include "wx/cmndata.h"

 #include "wx/math.h"
 #include "wx/msw/wrapcdlg.h"
 
 #include "wx/math.h"
 #include "wx/msw/wrapcdlg.h"
 

diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp
index 7011de08ea23c9e78ea90aebc8c29f328f3e3123..2c5a32114dd009d2349b5078edb58238b586c4ad 100644 (file)
--- a/src/msw/fontdlg.cpp
+++ b/src/msw/fontdlg.cpp
@@ -26,16 +26,17 @@
 
 #if wxUSE_FONTDLG
 
 
 #if wxUSE_FONTDLG
 

+#include "wx/fontdlg.h"
+

 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/log.h"

+    #include "wx/cmndata.h"

 #endif
 
 #endif
 

-#include "wx/fontdlg.h"

 #include "wx/msw/wrapcdlg.h"
 
 #include "wx/msw/wrapcdlg.h"
 

-#include "wx/cmndata.h"

 #include "wx/math.h"
 
 #include <stdlib.h>
 #include "wx/math.h"
 
 #include <stdlib.h>

diff --git a/src/msw/printdlg.cpp b/src/msw/printdlg.cpp
index 6a24fedea34845aa10c8694e6620689ddc5603e1..965fa3042e4daa9c29c30674584d27949de6032d 100644 (file)
--- a/src/msw/printdlg.cpp
+++ b/src/msw/printdlg.cpp
@@ -31,9 +31,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/dcprint.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/dcprint.h"

+    #include "wx/cmndata.h"

 #endif
 
 #endif
 

-#include "wx/cmndata.h"

 #include "wx/printdlg.h"
 #include "wx/msw/printdlg.h"
 #include "wx/paper.h"
 #include "wx/printdlg.h"
 #include "wx/msw/printdlg.h"
 #include "wx/paper.h"

diff --git a/src/os2/dirdlg.cpp b/src/os2/dirdlg.cpp
index 28af822197b86415b87df867a2f0e69707528a7d..9dacdc82d3ed99914d80ee0a71235cef9fccdd73 100644 (file)
--- a/src/os2/dirdlg.cpp
+++ b/src/os2/dirdlg.cpp
@@ -12,15 +12,16 @@
 // 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/dirdlg.h"
+

 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/utils.h"
     #include "wx/dialog.h"
 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/utils.h"
     #include "wx/dialog.h"

-    #include "wx/dirdlg.h"
+    #include "wx/cmndata.h"

 #endif
 
 #include "wx/os2/private.h"
 #endif
 
 #include "wx/os2/private.h"

-#include "wx/cmndata.h"

 
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/os2/fontdlg.cpp b/src/os2/fontdlg.cpp
index a4284a5e66d74b92213a373a66ef203612f2d589..1024e1b98e2af9825e3975d31c483d3f7a9c5b2f 100644 (file)
--- a/src/os2/fontdlg.cpp
+++ b/src/os2/fontdlg.cpp
@@ -13,21 +13,22 @@
 // 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/fontdlg.h"
+

 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/math.h"
 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/math.h"

+    #include "wx/cmndata.h"

 #endif
 
 #endif
 

-#include "wx/fontdlg.h"

 #include "wx/fontutil.h"
 
 #define INCL_PM
 #include <os2.h>
 
 #include "wx/os2/private.h"
 #include "wx/fontutil.h"
 
 #define INCL_PM
 #include <os2.h>
 
 #include "wx/os2/private.h"

-#include "wx/cmndata.h"

 
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>


@@ -36,10 +37,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
 
 int wxFontDialog::ShowModal()
 {
 
 int wxFontDialog::ShowModal()
 {

-    FONTDLG                         vFontDlg;
-    char                            zCurrentFont[FACESIZE];
-    HWND                            hWndFontDlg;
-    FACENAMEDESC                    vFn;
+    FONTDLG      vFontDlg;
+    char         zCurrentFont[FACESIZE];
+    HWND         hWndFontDlg;
+    FACENAMEDESC vFn;

 
     memset(&vFontDlg, '\0', sizeof(FONTDLG));
     zCurrentFont[0] = '\0';
 
     memset(&vFontDlg, '\0', sizeof(FONTDLG));
     zCurrentFont[0] = '\0';

diff --git a/src/palmos/colordlg.cpp b/src/palmos/colordlg.cpp
index d2edc5154bbaad6cec0231e7be28106ce8b1d858..5c27e3d23a43c24e5dc67a62a5ef74589471e3d7 100644 (file)
--- a/src/palmos/colordlg.cpp
+++ b/src/palmos/colordlg.cpp
@@ -24,15 +24,15 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

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

 #if wxUSE_COLOURDLG
 
 #if wxUSE_COLOURDLG
 

-#include "wx/cmndata.h"

 #include "wx/colordlg.h"
 
 #include "wx/colordlg.h"
 

+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/cmndata.h"
+#endif
+

 #include <UIColor.h>
 #include <UIControls.h>
 
 #include <UIColor.h>
 #include <UIControls.h>
 

diff --git a/src/palmos/fontdlg.cpp b/src/palmos/fontdlg.cpp
index 2b494dc2e0450582c480e691451eb973a00c08f8..b65a2831fa51740eb90a0f0f38eed5dbff470f5f 100644 (file)
--- a/src/palmos/fontdlg.cpp
+++ b/src/palmos/fontdlg.cpp
@@ -33,12 +33,11 @@
     #include "wx/dialog.h"
     #include "wx/math.h"
     #include "wx/log.h"
     #include "wx/dialog.h"
     #include "wx/math.h"
     #include "wx/log.h"

+    #include "wx/cmndata.h"

 #endif
 
 #include "wx/palmos/private.h"
 
 #endif
 
 #include "wx/palmos/private.h"
 

-#include "wx/cmndata.h"
-

 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>