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

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

diff --git a/include/wx/wx.h b/include/wx/wx.h
index 9bcc46f7f4347bc3a86473889173d12ce07b9bb7..99aabf12bb0b4790bd06bacea860b38b51ce8ad0 100644 (file)
--- a/include/wx/wx.h
+++ b/include/wx/wx.h
@@ -34,6 +34,7 @@
 #include "wx/panel.h"
 #include "wx/toplevel.h"
 #include "wx/frame.h"
+#include "wx/gdicmn.h"
 #include "wx/region.h"
 #include "wx/bitmap.h"
 #include "wx/colour.h"

diff --git a/src/cocoa/colour.mm b/src/cocoa/colour.mm
index cc58fcb9f224b3c6a78b207bf68186bb5ec59920..94c1f4cc860b375c3e02f87823e08c7d58265916 100644 (file)
--- a/src/cocoa/colour.mm
+++ b/src/cocoa/colour.mm
@@ -14,10 +14,9 @@
 #include "wx/colour.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
 #endif //WX_PRECOMP
 
-#include "wx/gdicmn.h"
-
 #include "wx/cocoa/autorelease.h"
 
 #import <AppKit/NSColor.h>

diff --git a/src/cocoa/display.mm b/src/cocoa/display.mm
index 0694473028426ab901bb9612b28b7f8ed957bf03..8fea9718c8c228e1be4f482f6d2c2ae3cde7c052 100644 (file)
--- a/src/cocoa/display.mm
+++ b/src/cocoa/display.mm
@@ -23,10 +23,10 @@
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/string.h"
+    #include "wx/gdicmn.h"
 #endif
 
 #include "wx/display_impl.h"
-#include "wx/gdicmn.h"
 
 #import <Foundation/Foundation.h>
 

diff --git a/src/cocoa/font.cpp b/src/cocoa/font.cpp
index 88670a4d87d41f20b994af05d678001546c10b3f..61c71aaac047803a1ae902760abb825767a41a92 100644 (file)
--- a/src/cocoa/font.cpp
+++ b/src/cocoa/font.cpp
@@ -15,9 +15,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
+    #include "wx/gdicmn.h"
 #endif
 
-#include "wx/gdicmn.h"
 #include "wx/encinfo.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)

diff --git a/src/cocoa/settings.mm b/src/cocoa/settings.mm
index 618486478b1fcd62956e27628a76ab1e417badef..0b87a457af4782eb8050345a267fe6406687f0ca 100644 (file)
--- a/src/cocoa/settings.mm
+++ b/src/cocoa/settings.mm
@@ -15,10 +15,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
+    #include "wx/gdicmn.h"
 #endif
 
-#include "wx/gdicmn.h"
-
 #include "wx/cocoa/autorelease.h"
 
 #import <AppKit/NSColor.h>

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 1e3ca85951ea639a100f95209f499a04eed25bea..eb69bdb766f65076cab95364e530d68cd798877e 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -32,9 +32,9 @@
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/log.h"
+    #include "wx/gdicmn.h"
 #endif
 
-#include "wx/gdicmn.h"
 #include "wx/prntbase.h"
 #include "wx/printdlg.h"
 

diff --git a/src/common/colourcmn.cpp b/src/common/colourcmn.cpp
index 3c238495d4633fc4c81a1b7ef5871d0109959c9b..a20851c7674cccca3c355a3acb2e14772204464f 100644 (file)
--- a/src/common/colourcmn.cpp
+++ b/src/common/colourcmn.cpp
@@ -22,10 +22,9 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/utils.h"
+    #include "wx/gdicmn.h"
 #endif
 
-#include "wx/gdicmn.h"
-
 
 // ============================================================================
 // wxString <-> wxColour conversions

diff --git a/src/common/dpycmn.cpp b/src/common/dpycmn.cpp
index d375d9e49486c45def38db9e410808053a4ab381..ce5fc0ac22ec309e16641c8e7d9c0f40d3092b12 100644 (file)
--- a/src/common/dpycmn.cpp
+++ b/src/common/dpycmn.cpp
@@ -32,7 +32,6 @@
 #include "wx/display.h"
 #include "wx/display_impl.h"
 #include "wx/module.h"
-#include "wx/gdicmn.h"           // for wxDisplaySize()
 
 #if wxUSE_DISPLAY
 
@@ -268,4 +267,3 @@ int wxDisplayFactorySingle::GetFromPoint(const wxPoint& pt)
     // the point is outside of the screen
     return wxNOT_FOUND;
 }
-

diff --git a/src/common/effects.cpp b/src/common/effects.cpp
index bf68eb47403ada6d2f35bd2cd90ce368d6f2b2e4..a70f7032e22918a9b91aea42b3f9bea0b2600646 100644 (file)
--- a/src/common/effects.cpp
+++ b/src/common/effects.cpp
@@ -22,10 +22,9 @@
     #include "wx/dcmemory.h"
     #include "wx/pen.h"
     #include "wx/settings.h"
+    #include "wx/gdicmn.h"
 #endif //WX_PRECOMP
 
-#include "wx/gdicmn.h"
-
 /*
  * wxEffects: various 3D effects
  */

diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp
index f0d3ccf9c409076c2f2b996d4cf6d88dda6d7fab..3033c5d6ca1e0263ccab339d2828b891263ffee9 100644 (file)
--- a/src/common/fontcmn.cpp
+++ b/src/common/fontcmn.cpp
@@ -31,10 +31,9 @@
     #include "wx/intl.h"
     #include "wx/dcscreen.h"
     #include "wx/log.h"
+    #include "wx/gdicmn.h"
 #endif // WX_PRECOMP
 
-#include "wx/gdicmn.h"
-
 #if defined(__WXMSW__)
     #include  "wx/msw/private.h"  // includes windows.h for LOGFONT
     #include  "wx/msw/winundef.h"
@@ -268,7 +267,7 @@ wxString wxFontBase::GetNativeFontInfoDesc() const
     if ( fontInfo )
     {
         fontDesc = fontInfo->ToString();
-        wxASSERT_MSG(!fontDesc.IsEmpty(), wxT("This should be a non-empty string!"));
+        wxASSERT_MSG(!fontDesc.empty(), wxT("This should be a non-empty string!"));
     }
     else
     {
@@ -285,7 +284,7 @@ wxString wxFontBase::GetNativeFontInfoUserDesc() const
     if ( fontInfo )
     {
         fontDesc = fontInfo->ToUserString();
-        wxASSERT_MSG(!fontDesc.IsEmpty(), wxT("This should be a non-empty string!"));
+        wxASSERT_MSG(!fontDesc.empty(), wxT("This should be a non-empty string!"));
     }
     else
     {

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index ef89bce74c58953d95fbedc8107bab64c0a999d3..1fbd5e997bf1f54365556e1ad91c641963375d6c 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -35,11 +35,11 @@
     #include "wx/layout.h"
     #include "wx/sizer.h"
     #include "wx/textdlg.h"
+    #include "wx/gdicmn.h"
 #endif
 
 #include "wx/module.h"
 #include "wx/filefn.h"
-#include "wx/gdicmn.h"
 #include "wx/imaglist.h"
 #include "wx/tokenzr.h"
 #include "wx/dir.h"

diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp
index 817dd01986f07abee00454b65e18b46ea1511f22..138321f6bfb3fbdcb52bd7f825b8bb34dd9e83d0 100644 (file)
--- a/src/generic/renderg.cpp
+++ b/src/generic/renderg.cpp
@@ -30,10 +30,9 @@
     #include "wx/string.h"
     #include "wx/dc.h"
     #include "wx/settings.h"
+    #include "wx/gdicmn.h"
 #endif //WX_PRECOMP
 
-#include "wx/gdicmn.h"
-
 #include "wx/splitter.h"
 #include "wx/dcmirror.h"
 #include "wx/module.h"

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 904968dc496c87b1c59960e74a21a1bb0ad55901..3169d499144ff4223d763828c843c592299407e3 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -27,9 +27,9 @@
     #include "wx/msgdlg.h"
     #include "wx/memory.h"
     #include "wx/font.h"
+    #include "wx/gdicmn.h"
 #endif
 
-#include "wx/gdicmn.h"
 #include "wx/file.h"
 #include "wx/filename.h"
 #include "wx/module.h"

diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index ffd858bc7671da6c176f725146564777467ed252..2d234e0f9217644224ead3c9aaf4fe19e44fd064 100644 (file)
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -20,10 +20,9 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/window.h"
+    #include "wx/gdicmn.h"
 #endif
 
-#include "wx/gdicmn.h"
-
 #include "wx/gtk/private.h"
 
 #include <gdk/gdkprivate.h>

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index ca71f41a55f77446241b47ee26a87e8285ecb2f4..15b85db5665071da7c2a9423a2133b53edc5cbee 100644 (file)
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -25,10 +25,10 @@
     #include "wx/utils.h"
     #include "wx/settings.h"
     #include "wx/cmndata.h"
+    #include "wx/gdicmn.h"
 #endif
 
 #include "wx/fontutil.h"
-#include "wx/gdicmn.h"
 #include "wx/tokenzr.h"
 
 #include <strings.h>

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 4d47d138f2606e1cf3999be3d25c4da8ee005531..467858c6284502f758e0229dabbcb186e39eaa89 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -27,9 +27,9 @@
     #include "wx/msgdlg.h"
     #include "wx/memory.h"
     #include "wx/font.h"
+    #include "wx/gdicmn.h"
 #endif
 
-#include "wx/gdicmn.h"
 #include "wx/file.h"
 #include "wx/filename.h"
 #include "wx/module.h"

diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp
index 39dcf5e3bde00041013043ec9b12b5356ad01ae6..68652fed398a03579870424a0e1af04ff17f3bab 100644 (file)
--- a/src/gtk1/colour.cpp
+++ b/src/gtk1/colour.cpp
@@ -12,7 +12,10 @@
 
 #include "wx/colour.h"
 
-#include "wx/gdicmn.h"
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+#endif
+
 #include "wx/gtk1/private.h"
 
 #include <gdk/gdk.h>

diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp
index becc53af147002f8940f251ae63121f2b30c87c7..34f533e5c759b084ddc143f139efa9312c580d76 100644 (file)
--- a/src/gtk1/dnd.cpp
+++ b/src/gtk1/dnd.cpp
@@ -20,10 +20,9 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/window.h"
+    #include "wx/gdicmn.h"
 #endif
 
-#include "wx/gdicmn.h"
-
 #include "wx/gtk1/private.h"
 
 #include <gdk/gdkprivate.h>

diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index ca4044af47e436c9712e7886dd7605b34f52811f..f2334339a05c9b7ada2d3d8e769f107e89683133 100644 (file)
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/gtk/font.cpp
+// Name:        src/gtk1/font.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -24,11 +24,11 @@
     #include "wx/log.h"
     #include "wx/settings.h"
     #include "wx/cmndata.h"
+    #include "wx/gdicmn.h"
 #endif
 
 #include "wx/fontutil.h"
 #include "wx/utils.h"
-#include "wx/gdicmn.h"
 #include "wx/tokenzr.h"
 
 #include <strings.h>

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 97ba0f25e5fa4922811da6d802f7cf121c93a11f..3a350c95023f9c9e61ab322db1872a6ac6036d75 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -31,9 +31,9 @@
     #include "wx/msgdlg.h"
     #include "wx/textctrl.h"
     #include "wx/memory.h"
+    #include "wx/gdicmn.h"
 #endif
 
-#include "wx/gdicmn.h"
 #include "wx/module.h"
 #include "wx/tooltip.h"
 #include "wx/docview.h"

diff --git a/src/mac/carbon/colour.cpp b/src/mac/carbon/colour.cpp
index e9237fdbc60f87225005e5a023fb49c2d1b206f0..9d656b02614cea2b4d92bca6d84baac109af3403 100644 (file)
--- a/src/mac/carbon/colour.cpp
+++ b/src/mac/carbon/colour.cpp
@@ -13,7 +13,9 @@
 
 #include "wx/colour.h"
 
-#include "wx/gdicmn.h"
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+#endif
 
 #include "wx/mac/private.h"
 

diff --git a/src/mac/carbon/display.cpp b/src/mac/carbon/display.cpp
index aa3e320d348fe549402fb3b1f6cfb7011f2aec9c..feb556a200e0bc722ab295554d79d3ea9e068b5d 100644 (file)
--- a/src/mac/carbon/display.cpp
+++ b/src/mac/carbon/display.cpp
@@ -31,6 +31,7 @@
     #include "wx/dynarray.h"
     #include "wx/log.h"
     #include "wx/string.h"
+    #include "wx/gdicmn.h"
 #endif
 
 #ifdef __DARWIN__
@@ -45,7 +46,6 @@
 #endif
 
 #include "wx/display_impl.h"
-#include "wx/gdicmn.h"
 
 // ----------------------------------------------------------------------------
 // display classes implementation

diff --git a/src/mac/carbon/dnd.cpp b/src/mac/carbon/dnd.cpp
index 456a2a90b8b995e39db111d7b457e5a1b0008ff3..834533d04a4ca38ea013901710d079215d113364 100644 (file)
--- a/src/mac/carbon/dnd.cpp
+++ b/src/mac/carbon/dnd.cpp
@@ -19,9 +19,9 @@
     #include "wx/app.h"
     #include "wx/window.h"
     #include "wx/toplevel.h"
+    #include "wx/gdicmn.h"
 #endif // WX_PRECOMP
 
-#include "wx/gdicmn.h"
 #include "wx/mac/private.h"
 
 #ifndef __DARWIN__

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index 404b356b05cbb299ab60f6402e057dcff765bf7c..ff9671bd6c5765b9ed79128900fb31b15aba1450 100644 (file)
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -17,10 +17,10 @@
     #include "wx/string.h"
     #include "wx/utils.h"
     #include "wx/intl.h"
+    #include "wx/gdicmn.h"
 #endif
 
 #include "wx/fontutil.h"
-#include "wx/gdicmn.h"
 #include "wx/fontutil.h"
 
 #include "wx/mac/private.h"

diff --git a/src/mac/carbon/gdiobj.cpp b/src/mac/carbon/gdiobj.cpp
index f6c046cc61d9e61eba6e1d3e3e0b7d62d8ddbb7e..163429e27f3c46dc433ab1a843a9d3a678dd2446 100644 (file)
--- a/src/mac/carbon/gdiobj.cpp
+++ b/src/mac/carbon/gdiobj.cpp
@@ -1,18 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        gdiobj.cpp
+// Name:        src/mac/carbon/gdiobj.cpp
 // Purpose:     wxGDIObject class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 #include "wx/gdiobj.h"
-#include "wx/gdicmn.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+#endif
+
 #include "wx/mac/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)

diff --git a/src/mac/carbon/region.cpp b/src/mac/carbon/region.cpp
index a123e2a6479166674ff368e3d5836d29ee699da1..23e905e86900eaaee465a306c42ae3509a456a8a 100644 (file)
--- a/src/mac/carbon/region.cpp
+++ b/src/mac/carbon/region.cpp
@@ -12,7 +12,10 @@
 
 #include "wx/region.h"
 
-#include "wx/gdicmn.h"
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+#endif
+
 #include "wx/mac/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)

diff --git a/src/mac/carbon/settings.cpp b/src/mac/carbon/settings.cpp
index 450b800996b8c6134332030117f4009b9471bf24..e543a54fd8e0ed75bf0e00d2332ec70f5ce9db43 100644 (file)
--- a/src/mac/carbon/settings.cpp
+++ b/src/mac/carbon/settings.cpp
@@ -15,10 +15,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
+    #include "wx/gdicmn.h"
 #endif
 
-#include "wx/gdicmn.h"
-
 #include "wx/mac/uma.h"
 
 // ----------------------------------------------------------------------------

diff --git a/src/mac/classic/app.cpp b/src/mac/classic/app.cpp
index 9e8ea08601decb91982ea215b831155e08d95cc8..c2f121a0f46b49a247382466c362ea62ec9cbb1b 100644 (file)
--- a/src/mac/classic/app.cpp
+++ b/src/mac/classic/app.cpp
@@ -35,9 +35,9 @@
     #include "wx/msgdlg.h"
     #include "wx/textctrl.h"
     #include "wx/memory.h"
+    #include "wx/gdicmn.h"
 #endif
 
-#include "wx/gdicmn.h"
 #include "wx/module.h"
 #include "wx/tooltip.h"
 #include "wx/docview.h"

diff --git a/src/mac/classic/colour.cpp b/src/mac/classic/colour.cpp
index 2ceddee5988a9e2fd636e17a8582699331ea6e03..17760ac498e74b5ae3a9b080a960957261167bca 100644 (file)
--- a/src/mac/classic/colour.cpp
+++ b/src/mac/classic/colour.cpp
@@ -13,7 +13,9 @@
 
 #include "wx/colour.h"
 
-#include "wx/gdicmn.h"
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+#endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 

diff --git a/src/mac/classic/display.cpp b/src/mac/classic/display.cpp
index f216f1fd65d696d59875cc69546193cf4b9a36af..91b96a77b66ecfac3c39d79a039806a961fc8ec5 100644 (file)
--- a/src/mac/classic/display.cpp
+++ b/src/mac/classic/display.cpp
@@ -32,6 +32,7 @@
     #include "wx/dynarray.h"
     #include "wx/log.h"
     #include "wx/string.h"
+    #include "wx/gdicmn.h"
 #endif
 
 #ifdef __DARWIN__
@@ -45,7 +46,6 @@
 #endif
 
 #include "wx/display_impl.h"
-#include "wx/gdicmn.h"
 
 // ----------------------------------------------------------------------------
 // display implementation classes

diff --git a/src/mac/classic/dnd.cpp b/src/mac/classic/dnd.cpp
index 1265d89eae193d5c7dd339d07255ed1061729107..e770b842d9ca0c94527ac4cfdeb558fa8ad6323f 100644 (file)
--- a/src/mac/classic/dnd.cpp
+++ b/src/mac/classic/dnd.cpp
@@ -23,9 +23,9 @@
     #include "wx/app.h"
     #include "wx/window.h"
     #include "wx/toplevel.h"
+    #include "wx/gdicmn.h"
 #endif // WX_PRECOMP
 
-#include "wx/gdicmn.h"
 #include "wx/mac/private.h"
 
 // ----------------------------------------------------------------------------

diff --git a/src/mac/classic/font.cpp b/src/mac/classic/font.cpp
index daad04f0d7d4f99e257f0c9ea4fde73a103425b0..e2757af968e2ef26f84de2fedcad0861771f4999 100644 (file)
--- a/src/mac/classic/font.cpp
+++ b/src/mac/classic/font.cpp
@@ -20,10 +20,10 @@
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/utils.h"
+    #include "wx/gdicmn.h"
 #endif
 
 #include "wx/fontutil.h"
-#include "wx/gdicmn.h"
 
 #include "wx/fontutil.h"
 

diff --git a/src/mac/classic/gdiobj.cpp b/src/mac/classic/gdiobj.cpp
index 9b74779924c31da498b57262c8a3a4942210dac1..5ba78d39346ba6c79e73ba677a5d9b7f2994a3b2 100644 (file)
--- a/src/mac/classic/gdiobj.cpp
+++ b/src/mac/classic/gdiobj.cpp
@@ -1,16 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        gdiobj.cpp
+// Name:        src/mac/classic/gdiobj.cpp
 // Purpose:     wxGDIObject class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#include "wx/wxprec.h"
+
 #include "wx/gdiobj.h"
-#include "wx/gdicmn.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+#endif
+
 #include "wx/mac/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)

diff --git a/src/mac/classic/region.cpp b/src/mac/classic/region.cpp
index 4bfadfd5bbca254f1f2349187ba2c16bad0ab9d6..2b25c299cc6955e877a0a13efa26439167103574 100644 (file)
--- a/src/mac/classic/region.cpp
+++ b/src/mac/classic/region.cpp
@@ -12,7 +12,10 @@
 
 #include "wx/region.h"
 
-#include "wx/gdicmn.h"
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+#endif
+
 #include "wx/mac/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)

diff --git a/src/mac/classic/settings.cpp b/src/mac/classic/settings.cpp
index fda51b49280fb873c37000859a75d736ad6c9bfd..5e24b61348e839e71726468a65fa68a0c82e95d0 100644 (file)
--- a/src/mac/classic/settings.cpp
+++ b/src/mac/classic/settings.cpp
@@ -15,10 +15,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
+    #include "wx/gdicmn.h"
 #endif
 
-#include "wx/gdicmn.h"
-
 #include "wx/mac/uma.h"
 
 // ----------------------------------------------------------------------------

diff --git a/src/mgl/colour.cpp b/src/mgl/colour.cpp
index 4232f86476e39ede8f4994d8236da9019e2e1e0e..f4f27268794f0c2be1fb42f09acfa80269d90390 100644 (file)
--- a/src/mgl/colour.cpp
+++ b/src/mgl/colour.cpp
@@ -18,7 +18,9 @@
 
 #include "wx/colour.h"
 
-#include "wx/gdicmn.h"
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+#endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 

diff --git a/src/mgl/font.cpp b/src/mgl/font.cpp
index ddd6799cc87975ff59b23b28eb0fd4ffe320552c..1b9410516b98e21f9cc65a809478869ff7770f7f 100644 (file)
--- a/src/mgl/font.cpp
+++ b/src/mgl/font.cpp
@@ -28,10 +28,10 @@
     #include "wx/utils.h"
     #include "wx/settings.h"
     #include "wx/cmndata.h"
+    #include "wx/gdicmn.h"
 #endif
 
 #include "wx/fontutil.h"
-#include "wx/gdicmn.h"
 #include "wx/tokenzr.h"
 #include "wx/mgl/private.h"
 

diff --git a/src/mgl/region.cpp b/src/mgl/region.cpp
index 78b688a6cb41bdeba3833be88d571aab198b2ded..36d60598d75c70b8c5ef6e773477ccb400052f78 100644 (file)
--- a/src/mgl/region.cpp
+++ b/src/mgl/region.cpp
@@ -11,12 +11,15 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #include "wx/region.h"
 
-#include "wx/gdicmn.h"
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+#endif
+
 #include "wx/thread.h"
 #include "wx/module.h"
 

diff --git a/src/mgl/settings.cpp b/src/mgl/settings.cpp
index c051f96414a38b0726b26f5e9fd6c22866312ff3..6254a65ed99ae3968e8144f69481cfb702c7fd57 100644 (file)
--- a/src/mgl/settings.cpp
+++ b/src/mgl/settings.cpp
@@ -18,9 +18,9 @@
 #ifndef WX_PRECOMP
     #include "wx/colour.h"
     #include "wx/font.h"
+    #include "wx/gdicmn.h"
 #endif
 
-#include "wx/gdicmn.h"
 #include "wx/module.h"
 
 // ----------------------------------------------------------------------------

diff --git a/src/motif/colour.cpp b/src/motif/colour.cpp
index 657bf6b849dbdcda6ae5540b3de27abfff5e5e69..63d34f901e6e15efa57158c3c5a68467ec234fcb 100644 (file)
--- a/src/motif/colour.cpp
+++ b/src/motif/colour.cpp
@@ -19,10 +19,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/gdicmn.h"
 #endif
 
-#include "wx/gdicmn.h"
-
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif

diff --git a/src/motif/dnd.cpp b/src/motif/dnd.cpp
index 8cb7763047f3f6a6d5d77388c12218f7fadaab60..2a408c438fe65aee47aa45d7e0798ffbd1a698bf 100644 (file)
--- a/src/motif/dnd.cpp
+++ b/src/motif/dnd.cpp
@@ -20,10 +20,9 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/window.h"
+    #include "wx/gdicmn.h"
 #endif
 
-#include "wx/gdicmn.h"
-
 #include <X11/Xlib.h>
 
 // ----------------------------------------------------------------------------

diff --git a/src/motif/font.cpp b/src/motif/font.cpp
index 382fcb71b48dfa50c780bdb0e98a1e5a3841e3b2..b16a93e08536e26bd9c696b1d79fd7cfdf0abdb0 100644 (file)
--- a/src/motif/font.cpp
+++ b/src/motif/font.cpp
@@ -35,9 +35,9 @@
     #include "wx/string.h"
     #include "wx/utils.h"       // for wxGetDisplay()
     #include "wx/settings.h"
+    #include "wx/gdicmn.h"
 #endif
 
-#include "wx/gdicmn.h"
 #include "wx/fontutil.h"    // for wxNativeFontInfo
 #include "wx/tokenzr.h"
 #include "wx/motif/private.h"
@@ -675,7 +675,7 @@ void wxGetTextExtent(WXDisplay* display, const wxFont& font,
 
     int direction, ascent2, descent2;
     XCharStruct overall;
-    int slen = str.Len();
+    int slen = str.length();
 
     XTextExtents((XFontStruct*) pFontStruct, (char*) str.c_str(), slen,
                  &direction, &ascent2, &descent2, &overall);

diff --git a/src/motif/settings.cpp b/src/motif/settings.cpp
index eadd07d8a6c95f3eab4dfc08001017258cabf09d..87ade0a057b508800b77f886d8cee18b1b8a93f2 100644 (file)
--- a/src/motif/settings.cpp
+++ b/src/motif/settings.cpp
@@ -20,10 +20,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/gdicmn.h"
 #endif
 
-#include "wx/gdicmn.h"
-
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif

diff --git a/src/msw/colour.cpp b/src/msw/colour.cpp
index 8d667f730e86f9ac6d70e55f65ae22e8d1705463..44ba6fb378b8ba5113692043d5f1c08ea8be36a7 100644 (file)
--- a/src/msw/colour.cpp
+++ b/src/msw/colour.cpp
@@ -18,7 +18,10 @@
 
 #include "wx/colour.h"
 
-#include "wx/gdicmn.h"
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+#endif
+
 #include "wx/msw/private.h"
 
 #include <string.h>

diff --git a/src/msw/region.cpp b/src/msw/region.cpp
index df3273df82423fb75378e131cd801de9fc7d9a4f..565ddf949c190c8e2285d0a13f0e1ae9b54eba1e 100644 (file)
--- a/src/msw/region.cpp
+++ b/src/msw/region.cpp
@@ -21,12 +21,15 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #include "wx/region.h"
 
-#include "wx/gdicmn.h"
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+#endif
+
 #include "wx/msw/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)

diff --git a/src/os2/colour.cpp b/src/os2/colour.cpp
index 93ae465dc26c105ef04d5cae838e26daa64779f1..205a2475bbd0bdf7cde0dbca8f1e765c79ecf050 100644 (file)
--- a/src/os2/colour.cpp
+++ b/src/os2/colour.cpp
@@ -15,9 +15,9 @@
 #include "wx/colour.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
 #endif
 
-#include "wx/gdicmn.h"
 #define INCL_GPI
 #define INCL_PM
 #include<os2.h>

diff --git a/src/os2/dnd.cpp b/src/os2/dnd.cpp
index 0f61318b7756f2cf992054dcb396967f5c7e4b27..e612b2ee65c5b725fa4df26f2dff184e5d2b4f86 100644 (file)
--- a/src/os2/dnd.cpp
+++ b/src/os2/dnd.cpp
@@ -19,10 +19,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/window.h"
+    #include "wx/gdicmn.h"
 #endif
 
-#include "wx/gdicmn.h"
-
 #define INCL_PM
 #define INCL_DOS
 #include <os2.h>

diff --git a/src/os2/gdiobj.cpp b/src/os2/gdiobj.cpp
index 909d5f70b6b983a5ad61a6702f4e252eee4404a0..0177d3c82de92a580f01bdc4df881f2b553e3fa7 100644 (file)
--- a/src/os2/gdiobj.cpp
+++ b/src/os2/gdiobj.cpp
@@ -15,10 +15,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/font.h"
+    #include "wx/gdicmn.h"
 #endif
 
-#include "wx/gdicmn.h"
-
 IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
 
 class wxStockGDIPM: public wxStockGDI

diff --git a/src/os2/region.cpp b/src/os2/region.cpp
index a0723c007389142b32bb6442d58e349fd0de5228..c575c4cdc61c6082963700adad4376c7f5baaf2b 100644 (file)
--- a/src/os2/region.cpp
+++ b/src/os2/region.cpp
@@ -15,10 +15,10 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/window.h"
+    #include "wx/gdicmn.h"
 #endif
 
 #include "wx/os2/region.h"
-#include "wx/gdicmn.h"
 
 #include "wx/os2/private.h"
 

diff --git a/src/palmos/colour.cpp b/src/palmos/colour.cpp
index c028e61493f6276a0e1eca29fc5c4ed78760b509..73a0a66c7446fac36f7c9beff9ce85439d2b12b4 100644 (file)
--- a/src/palmos/colour.cpp
+++ b/src/palmos/colour.cpp
@@ -18,7 +18,9 @@
 
 #include "wx/colour.h"
 
-#include "wx/gdicmn.h"
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+#endif
 
 #include <string.h>
 

diff --git a/src/palmos/region.cpp b/src/palmos/region.cpp
index 64e726b9977b395d8d0dbdbb708a450dda9a0268..8a408284a13656801abd36acfc59185bb94f8adc 100644 (file)
--- a/src/palmos/region.cpp
+++ b/src/palmos/region.cpp
@@ -21,12 +21,14 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #include "wx/region.h"
 
-#include "wx/gdicmn.h"
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+#endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject)

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 094bfdddbba778daa89c5f07e9e61ba34898be4b..f379aef0378705e64c4ee5bbc578bbf0ecd39d14 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -24,9 +24,9 @@
     #include "wx/dialog.h"
     #include "wx/timer.h"
     #include "wx/memory.h"
+    #include "wx/gdicmn.h"
 #endif
 
-#include "wx/gdicmn.h"
 #include "wx/module.h"
 #include "wx/evtloop.h"
 #include "wx/filename.h"

diff --git a/src/x11/colour.cpp b/src/x11/colour.cpp
index 32d69c30a0725f27eb135b118df6cab8f06f109d..b894d933b2c5a4d0e20397b2072999a568e5a331 100644 (file)
--- a/src/x11/colour.cpp
+++ b/src/x11/colour.cpp
@@ -16,10 +16,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/gdicmn.h"
 #endif
 
-#include "wx/gdicmn.h"
-
 #include "wx/x11/private.h"
 
 //-----------------------------------------------------------------------------

diff --git a/src/x11/cursor.cpp b/src/x11/cursor.cpp
index 3aff9bfa0e719ea6451f901795bcb8076bdeac77..03d92bd6506e093b28c905cbf960539f7a620e74 100644 (file)
--- a/src/x11/cursor.cpp
+++ b/src/x11/cursor.cpp
@@ -18,10 +18,9 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/icon.h"
+    #include "wx/gdicmn.h"
 #endif
 
-#include "wx/gdicmn.h"
-
 #include "wx/x11/private.h"
 
 #if !wxUSE_NANOX

diff --git a/src/x11/dnd.cpp b/src/x11/dnd.cpp
index 7b6cdbbecd79e599cc47191f180318c10cafee40..ce9aa24bbf6c19557639a4a0da16d274ddd4f66e 100644 (file)
--- a/src/x11/dnd.cpp
+++ b/src/x11/dnd.cpp
@@ -24,10 +24,9 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/window.h"
+    #include "wx/gdicmn.h"
 #endif
 
-#include "wx/gdicmn.h"
-
 #include <X11/Xlib.h>
 
 // ----------------------------------------------------------------------------

diff --git a/src/x11/font.cpp b/src/x11/font.cpp
index 675acc54bdd61665732c7cca70612e844bede49f..9cbc28fa1e940031c0757a1f9638e3ead3785810 100644 (file)
--- a/src/x11/font.cpp
+++ b/src/x11/font.cpp
@@ -35,9 +35,9 @@
     #include "wx/string.h"
     #include "wx/utils.h"       // for wxGetDisplay()
     #include "wx/settings.h"
+    #include "wx/gdicmn.h"
 #endif
 
-#include "wx/gdicmn.h"
 #include "wx/fontutil.h"    // for wxNativeFontInfo
 #include "wx/tokenzr.h"
 

diff --git a/src/x11/region.cpp b/src/x11/region.cpp
index dd487ea50f016165982461f5107e5f500cef7c30..d2f196d93fbc44430bc4cf799a7382d1fd1f1336 100644 (file)
--- a/src/x11/region.cpp
+++ b/src/x11/region.cpp
@@ -15,10 +15,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/gdicmn.h"
 #endif
 
-#include "wx/gdicmn.h"
-
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif

diff --git a/src/x11/settings.cpp b/src/x11/settings.cpp
index 3dc76f3a754292c21f054253169463939fd3dabd..c8016efec9501f769aab5e085528efc693ec09a8 100644 (file)
--- a/src/x11/settings.cpp
+++ b/src/x11/settings.cpp
@@ -18,7 +18,10 @@
 
 #include "wx/settings.h"
 
-#include "wx/gdicmn.h"
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+#endif
+
 #include "wx/x11/private.h"
 
 wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)