From dd05139a8023fd3e30476409fafbe04221c6d627 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Mon, 19 Jun 2006 20:18:46 +0000 Subject: [PATCH] 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 | 1 + src/cocoa/colour.mm | 3 +-- src/cocoa/display.mm | 2 +- src/cocoa/font.cpp | 2 +- src/cocoa/settings.mm | 3 +-- src/common/cmndata.cpp | 2 +- src/common/colourcmn.cpp | 3 +-- src/common/dpycmn.cpp | 2 -- src/common/effects.cpp | 3 +-- src/common/fontcmn.cpp | 7 +++---- src/generic/dirctrlg.cpp | 2 +- src/generic/renderg.cpp | 3 +-- src/gtk/app.cpp | 2 +- src/gtk/dnd.cpp | 3 +-- src/gtk/font.cpp | 2 +- src/gtk1/app.cpp | 2 +- src/gtk1/colour.cpp | 5 ++++- src/gtk1/dnd.cpp | 3 +-- src/gtk1/font.cpp | 4 ++-- src/mac/carbon/app.cpp | 2 +- src/mac/carbon/colour.cpp | 4 +++- src/mac/carbon/display.cpp | 2 +- src/mac/carbon/dnd.cpp | 2 +- src/mac/carbon/font.cpp | 2 +- src/mac/carbon/gdiobj.cpp | 10 +++++++--- src/mac/carbon/region.cpp | 5 ++++- src/mac/carbon/settings.cpp | 3 +-- src/mac/classic/app.cpp | 2 +- src/mac/classic/colour.cpp | 4 +++- src/mac/classic/display.cpp | 2 +- src/mac/classic/dnd.cpp | 2 +- src/mac/classic/font.cpp | 2 +- src/mac/classic/gdiobj.cpp | 12 +++++++++--- src/mac/classic/region.cpp | 5 ++++- src/mac/classic/settings.cpp | 3 +-- src/mgl/colour.cpp | 4 +++- src/mgl/font.cpp | 2 +- src/mgl/region.cpp | 7 +++++-- src/mgl/settings.cpp | 2 +- src/motif/colour.cpp | 3 +-- src/motif/dnd.cpp | 3 +-- src/motif/font.cpp | 4 ++-- src/motif/settings.cpp | 3 +-- src/msw/colour.cpp | 5 ++++- src/msw/region.cpp | 7 +++++-- src/os2/colour.cpp | 2 +- src/os2/dnd.cpp | 3 +-- src/os2/gdiobj.cpp | 3 +-- src/os2/region.cpp | 2 +- src/palmos/colour.cpp | 4 +++- src/palmos/region.cpp | 6 ++++-- src/x11/app.cpp | 2 +- src/x11/colour.cpp | 3 +-- src/x11/cursor.cpp | 3 +-- src/x11/dnd.cpp | 3 +-- src/x11/font.cpp | 2 +- src/x11/region.cpp | 3 +-- src/x11/settings.cpp | 5 ++++- 58 files changed, 109 insertions(+), 88 deletions(-) diff --git a/include/wx/wx.h b/include/wx/wx.h index 9bcc46f7f4..99aabf12bb 100644 --- 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 cc58fcb9f2..94c1f4cc86 100644 --- 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 diff --git a/src/cocoa/display.mm b/src/cocoa/display.mm index 0694473028..8fea9718c8 100644 --- 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 diff --git a/src/cocoa/font.cpp b/src/cocoa/font.cpp index 88670a4d87..61c71aaac0 100644 --- 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 618486478b..0b87a457af 100644 --- 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 diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp index 1e3ca85951..eb69bdb766 100644 --- 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 3c238495d4..a20851c767 100644 --- 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 d375d9e494..ce5fc0ac22 100644 --- 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 bf68eb4740..a70f7032e2 100644 --- 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 f0d3ccf9c4..3033c5d6ca 100644 --- 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 ef89bce74c..1fbd5e997b 100644 --- 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 817dd01986..138321f6bf 100644 --- 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 904968dc49..3169d49914 100644 --- 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 ffd858bc76..2d234e0f92 100644 --- 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 diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp index ca71f41a55..15b85db566 100644 --- 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 diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index 4d47d138f2..467858c628 100644 --- 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 39dcf5e3bd..68652fed39 100644 --- 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 diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp index becc53af14..34f533e5c7 100644 --- 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 diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp index ca4044af47..f2334339a0 100644 --- 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 diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp index 97ba0f25e5..3a350c9502 100644 --- 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 e9237fdbc6..9d656b0261 100644 --- 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 aa3e320d34..feb556a200 100644 --- 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 456a2a90b8..834533d04a 100644 --- 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 404b356b05..ff9671bd6c 100644 --- 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 f6c046cc61..163429e27f 100644 --- 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 a123e2a647..23e905e869 100644 --- 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 450b800996..e543a54fd8 100644 --- 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 9e8ea08601..c2f121a0f4 100644 --- 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 2ceddee598..17760ac498 100644 --- 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 f216f1fd65..91b96a77b6 100644 --- 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 1265d89eae..e770b842d9 100644 --- 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 daad04f0d7..e2757af968 100644 --- 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 9b74779924..5ba78d3934 100644 --- 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 4bfadfd5bb..2b25c299cc 100644 --- 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 fda51b4928..5e24b61348 100644 --- 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 4232f86476..f4f2726879 100644 --- 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 ddd6799cc8..1b9410516b 100644 --- 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 78b688a6cb..36d60598d7 100644 --- 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 c051f96414..6254a65ed9 100644 --- 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 657bf6b849..63d34f901e 100644 --- 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 8cb7763047..2a408c438f 100644 --- 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 // ---------------------------------------------------------------------------- diff --git a/src/motif/font.cpp b/src/motif/font.cpp index 382fcb71b4..b16a93e085 100644 --- 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 eadd07d8a6..87ade0a057 100644 --- 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 8d667f730e..44ba6fb378 100644 --- 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 diff --git a/src/msw/region.cpp b/src/msw/region.cpp index df3273df82..565ddf949c 100644 --- 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 93ae465dc2..205a2475bb 100644 --- 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 diff --git a/src/os2/dnd.cpp b/src/os2/dnd.cpp index 0f61318b77..e612b2ee65 100644 --- 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 diff --git a/src/os2/gdiobj.cpp b/src/os2/gdiobj.cpp index 909d5f70b6..0177d3c82d 100644 --- 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 a0723c0073..c575c4cdc6 100644 --- 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 c028e61493..73a0a66c74 100644 --- 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 diff --git a/src/palmos/region.cpp b/src/palmos/region.cpp index 64e726b997..8a408284a1 100644 --- 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 094bfdddbb..f379aef037 100644 --- 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 32d69c30a0..b894d933b2 100644 --- 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 3aff9bfa0e..03d92bd650 100644 --- 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 7b6cdbbecd..ce9aa24bbf 100644 --- 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 // ---------------------------------------------------------------------------- diff --git a/src/x11/font.cpp b/src/x11/font.cpp index 675acc54bd..9cbc28fa1e 100644 --- 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 dd487ea50f..d2f196d93f 100644 --- 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 3dc76f3a75..c8016efec9 100644 --- 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) -- 2.45.2