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

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

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"

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>

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>
 

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)

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>

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"
 

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

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;
 }
-

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
  */

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
     {

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"

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"

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"

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>

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>

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"

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>

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>

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>

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"

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"
 

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

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__

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"

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)

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)

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"
 
 // ----------------------------------------------------------------------------

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"

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)
 

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

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"
 
 // ----------------------------------------------------------------------------

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"
 

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)

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)

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"
 
 // ----------------------------------------------------------------------------

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)
 

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"
 

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"
 

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"
 
 // ----------------------------------------------------------------------------

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

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>
 
 // ----------------------------------------------------------------------------

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

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

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>

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)

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>

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>

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

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"
 

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>
 

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)

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"

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"
 
 //-----------------------------------------------------------------------------

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

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>
 
 // ----------------------------------------------------------------------------

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"
 

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

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)