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

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

src/cocoa/display.mm

@@ -18,14 +18,15 @@
 
 #if wxUSE_DISPLAY
 
+#include "wx/display.h"
+
 #ifndef WX_PRECOMP
-   #include "wx/dynarray.h"
+    #include "wx/dynarray.h"
+    #include "wx/string.h"
 #endif
 
-#include "wx/display.h"
 #include "wx/display_impl.h"
 #include "wx/gdicmn.h"
-#include "wx/string.h"
 
 #import <Foundation/Foundation.h>
 
@@ -226,4 +227,3 @@ bool wxDisplayImplMacOSX::ChangeMode(const wxVideoMode& mode)
 }
 
 #endif // wxUSE_DISPLAY
-

src/common/socket.cpp

@@ -22,13 +22,15 @@
 
 #if wxUSE_SOCKETS
 
+#include "wx/socket.h"
+
 #ifndef WX_PRECOMP
     #include "wx/object.h"
+    #include "wx/string.h"
 #endif
 
 #include "wx/app.h"
 #include "wx/apptrait.h"
-#include "wx/string.h"
 #include "wx/timer.h"
 #include "wx/utils.h"
 #include "wx/module.h"
@@ -37,7 +39,6 @@
 #include "wx/event.h"
 
 #include "wx/sckaddr.h"
-#include "wx/socket.h"
 #include "wx/datetime.h"
 
 // DLL options compatibility check:

src/common/sysopt.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        common/sysopt.cpp
+// Name:        src/common/sysopt.cpp
 // Purpose:     wxSystemOptions
 // Author:      Julian Smart
 // Modified by:
@@ -26,12 +26,13 @@
 
 #if wxUSE_SYSTEM_OPTIONS
 
+#include "wx/sysopt.h"
+
 #ifndef WX_PRECOMP
     #include "wx/list.h"
+    #include "wx/string.h"
 #endif
 
-#include "wx/string.h"
-#include "wx/sysopt.h"
 #include "wx/arrstr.h"
 
 // ----------------------------------------------------------------------------
@@ -86,4 +87,3 @@ bool wxSystemOptions::HasOption(const wxString& name)
 }
 
 #endif // wxUSE_SYSTEM_OPTIONS
-

src/common/url.cpp

@@ -18,14 +18,15 @@
 
 #if wxUSE_URL
 
+#include "wx/url.h"
+
 #ifndef WX_PRECOMP
     #include "wx/list.h"
+    #include "wx/string.h"
 #endif
 
-#include "wx/string.h"
 #include "wx/utils.h"
 #include "wx/module.h"
-#include "wx/url.h"
 
 #include <string.h>
 #include <ctype.h>

src/common/variant.cpp

@@ -16,6 +16,12 @@
     #pragma hdrstop
 #endif
 
+#include "wx/variant.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+#endif
+
 #if wxUSE_STD_IOSTREAM
     #if wxUSE_IOSTREAMH
         #include <fstream.h>
@@ -38,8 +44,6 @@ using namespace std ;
 #include "wx/tokenzr.h"
 #include "wx/math.h"
 
-#include "wx/variant.h"
-
 IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject)
 
 wxVariant WXDLLIMPEXP_BASE wxNullVariant;

src/generic/notebook.cpp

@@ -21,16 +21,18 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
-#ifndef __WXPALMOS__
+#include  "wx/notebook.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+#endif
 
-#include  "wx/string.h"
 #include  "wx/log.h"
 #include  "wx/settings.h"
 #include  "wx/generic/imaglist.h"
-#include  "wx/notebook.h"
 #include  "wx/dcclient.h"
 #include  "wx/generic/tabg.h"
 
@@ -711,5 +713,3 @@ bool wxNotebookTabView::OnTabPreActivate(int activateId, int deactivateId)
   }
   return retval;
 }
-
-#endif // __WXPALMOS__

src/gtk/utilsgtk.cpp

@@ -11,7 +11,10 @@
 #include "wx/wxprec.h"
 
 #include "wx/utils.h"
-#include "wx/string.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+#endif
 
 #include "wx/apptrait.h"
 #include "wx/intl.h"
@@ -69,12 +72,12 @@ bool wxSetDetectableAutoRepeat( bool flag )
 {
     Bool result;
     XkbSetDetectableAutoRepeat( GDK_DISPLAY(), flag, &result );
-    return result;       /* TRUE if keyboard hardware supports this mode */
+    return result;       /* true if keyboard hardware supports this mode */
 }
 #else
 bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
 {
-    return FALSE;
+    return false;
 }
 #endif
 
@@ -152,7 +155,7 @@ void wxGetMousePosition( int* x, int* y )
 
 bool wxColourDisplay()
 {
-    return TRUE;
+    return true;
 }
 
 int wxDisplayDepth()
@@ -256,4 +259,3 @@ int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
 
     return tag;
 }
-

src/gtk/utilsres.cpp

@@ -10,12 +10,13 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/utils.h"
+
 #ifndef WX_PRECOMP
     #include "wx/list.h"
+    #include "wx/string.h"
 #endif
 
-#include "wx/utils.h"
-#include "wx/string.h"
 #include "wx/log.h"
 #include "wx/config.h"
 #include "wx/app.h"

src/gtk1/utilsgtk.cpp

@@ -11,7 +11,10 @@
 #include "wx/wxprec.h"
 
 #include "wx/utils.h"
-#include "wx/string.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+#endif
 
 #include "wx/apptrait.h"
 #include "wx/intl.h"
@@ -70,12 +73,12 @@ bool wxSetDetectableAutoRepeat( bool flag )
 {
     Bool result;
     XkbSetDetectableAutoRepeat( GDK_DISPLAY(), flag, &result );
-    return result;       /* TRUE if keyboard hardware supports this mode */
+    return result;       /* true if keyboard hardware supports this mode */
 }
 #else
 bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
 {
-    return FALSE;
+    return false;
 }
 #endif
 
@@ -118,7 +121,7 @@ void wxGetMousePosition( int* x, int* y )
 
 bool wxColourDisplay()
 {
-    return TRUE;
+    return true;
 }
 
 int wxDisplayDepth()
@@ -194,4 +197,3 @@ int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
 
     return tag;
 }
-

src/gtk1/utilsres.cpp

@@ -10,12 +10,13 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/utils.h"
+
 #ifndef WX_PRECOMP
     #include "wx/list.h"
+    #include "wx/string.h"
 #endif
 
-#include "wx/utils.h"
-#include "wx/string.h"
 #include "wx/log.h"
 #include "wx/config.h"
 #include "wx/app.h"

src/mac/carbon/accel.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        accel.cpp
+// Name:        src/mac/carbon/accel.cpp
 // Purpose:     wxAcceleratorTable
 // Author:      Stefan Csomor
 // Modified by:
@@ -12,7 +12,10 @@
 #include "wx/wxprec.h"
 
 #include "wx/accel.h"
-#include "wx/string.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+#endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
 
@@ -99,5 +102,3 @@ int wxAcceleratorTable::GetCommand( wxKeyEvent &event )
 
     return -1;
 }
-
-

src/mac/carbon/cfsocket.cpp

@@ -17,13 +17,15 @@
 
 #if wxUSE_SOCKETS
 
+#include "wx/socket.h"
+
 #ifndef WX_PRECOMP
     #include "wx/object.h"
+    #include "wx/string.h"
 #endif
 
 #include "wx/app.h"
 #include "wx/apptrait.h"
-#include "wx/string.h"
 #include "wx/timer.h"
 #include "wx/utils.h"
 #include "wx/module.h"
@@ -32,7 +34,6 @@
 #include "wx/event.h"
 
 #include "wx/sckaddr.h"
-#include "wx/socket.h"
 #include "wx/mac/carbon/private.h"
 
 #include <sys/socket.h>

src/mac/carbon/display.cpp

@@ -25,9 +25,12 @@
 
 #if wxUSE_DISPLAY
 
+#include "wx/display.h"
+
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/log.h"
+    #include "wx/string.h"
 #endif
 
 #ifdef __DARWIN__
@@ -41,10 +44,8 @@
     #include <Debugging.h>
 #endif
 
-#include "wx/display.h"
 #include "wx/display_impl.h"
 #include "wx/gdicmn.h"
-#include "wx/string.h"
 
 // ----------------------------------------------------------------------------
 // display classes implementation

src/mac/carbon/font.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        font.cpp
+// Name:        src/mac/carbon/font.cpp
 // Purpose:     wxFont class
 // Author:      Stefan Csomor
 // Modified by:
@@ -11,8 +11,12 @@
 
 #include "wx/wxprec.h"
 
-#include "wx/string.h"
 #include "wx/font.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+#endif
+
 #include "wx/fontutil.h"
 #include "wx/gdicmn.h"
 #include "wx/utils.h"
@@ -39,7 +43,7 @@ public:
         , m_family(wxDEFAULT)
         , m_style(wxNORMAL)
         , m_weight(wxNORMAL)
-        , m_underlined(FALSE)
+        , m_underlined(false)
         , m_faceName(wxT("applicationfont"))
         , m_encoding(wxFONTENCODING_DEFAULT)
         , m_macFontNum(0)
@@ -216,7 +220,7 @@ void wxFontRefData::MacFindFont()
     }
     else
     {
-        if ( m_faceName.Length() == 0 )
+        if ( m_faceName.empty() )
         {
             switch ( m_family )
             {
@@ -637,4 +641,3 @@ const wxNativeFontInfo * wxFont::GetNativeFontInfo() const
 
     return &(M_FONTDATA->m_info);
 }
-

src/mac/carbon/notebmac.cpp

@@ -13,12 +13,17 @@
 
 #if wxUSE_NOTEBOOK
 
+#include "wx/notebook.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+#endif
+
 #include "wx/app.h"
 #include "wx/string.h"
 #include "wx/log.h"
 #include "wx/imaglist.h"
 #include "wx/image.h"
-#include "wx/notebook.h"
 #include "wx/mac/uma.h"
 
 
@@ -96,18 +101,18 @@ bool wxNotebook::Create( wxWindow *parent,
     ControlTabSize tabsize;
     switch (GetWindowVariant())
     {
-    	case wxWINDOW_VARIANT_MINI:
+        case wxWINDOW_VARIANT_MINI:
             if ( UMAGetSystemVersion() >= 0x1030 )
                 tabsize = 3 ;
             else
                 tabsize = kControlSizeSmall;
             break;
 
-    	case wxWINDOW_VARIANT_SMALL:
+        case wxWINDOW_VARIANT_SMALL:
             tabsize = kControlTabSizeSmall;
             break;
 
-    	default:
+        default:
             tabsize = kControlTabSizeLarge;
             break;
     }

src/mac/carbon/sound.cpp

@@ -14,14 +14,15 @@
 
 #if wxUSE_SOUND
 
+#include "wx/sound.h"
+
 #ifndef WX_PRECOMP
     #include "wx/object.h"
+    #include "wx/string.h"
 #endif
 
-#include "wx/string.h"
 #include "wx/log.h"
 #include "wx/file.h"
-#include "wx/sound.h"
 #include "wx/timer.h"
 #include "wx/intl.h"
 

src/mac/classic/accel.cpp

@@ -12,7 +12,10 @@
 #include "wx/wxprec.h"
 
 #include "wx/accel.h"
-#include "wx/string.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+#endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
 
@@ -47,7 +50,7 @@ wxAcceleratorRefData::wxAcceleratorRefData()
 
 wxAcceleratorRefData::~wxAcceleratorRefData()
 {
-    m_accels.DeleteContents( TRUE );
+    m_accels.DeleteContents( true );
 }
 
 wxAcceleratorTable::wxAcceleratorTable()

src/mac/classic/display.cpp

@@ -26,9 +26,12 @@
 
 #if wxUSE_DISPLAY
 
+#include "wx/display.h"
+
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/log.h"
+    #include "wx/string.h"
 #endif
 
 #ifdef __DARWIN__
@@ -41,10 +44,8 @@
     #include <FixMath.h>
 #endif
 
-#include "wx/display.h"
 #include "wx/display_impl.h"
 #include "wx/gdicmn.h"
-#include "wx/string.h"
 
 // ----------------------------------------------------------------------------
 // display implementation classes

src/mac/classic/font.cpp

@@ -15,8 +15,12 @@
     #pragma hdrstop
 #endif
 
-#include "wx/string.h"
 #include "wx/font.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+#endif
+
 #include "wx/fontutil.h"
 #include "wx/gdicmn.h"
 #include "wx/utils.h"
@@ -166,7 +170,7 @@ wxFontRefData::~wxFontRefData()
 
 void wxFontRefData::MacFindFont()
 {
-    if( m_faceName.Length() == 0 )
+    if( m_faceName.empty() )
     {
         switch( m_family )
         {

src/mac/classic/notebmac.cpp

@@ -9,6 +9,8 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
+#include "wx/wxprec.h"
+
 // ============================================================================
 // declarations
 // ============================================================================
@@ -16,12 +18,17 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
+
+#include "wx/notebook.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+#endif
+
 #include "wx/app.h"
-#include "wx/string.h"
 #include "wx/log.h"
 #include "wx/imaglist.h"
 #include "wx/image.h"
-#include "wx/notebook.h"
 #include "wx/mac/uma.h"
 // ----------------------------------------------------------------------------
 // macros

src/mac/classic/sound.cpp

@@ -14,13 +14,13 @@
 
 #if wxUSE_SOUND
 
+#include "wx/sound.h"
+
 #ifndef WX_PRECOMP
     #include "wx/object.h"
+    #include "wx/string.h"
 #endif
 
-#include "wx/string.h"
-#include "wx/sound.h"
-
 #ifdef __WXMAC__
 #include "wx/mac/private.h"
 #ifndef __DARWIN__

src/mac/corefoundation/hid.cpp

@@ -27,12 +27,13 @@
 //DARWIN _ONLY_
 #ifdef __DARWIN__
 
+#include "wx/mac/corefoundation/hid.h"
+
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
+    #include "wx/string.h"
 #endif
 
-#include "wx/mac/corefoundation/hid.h"
-#include "wx/string.h"
 #include "wx/log.h"
 #include "wx/mac/corefoundation/cfstring.h"
 

src/mgl/fontenum.cpp

@@ -22,14 +22,15 @@
 // headers
 // ----------------------------------------------------------------------------
 
+#include "wx/fontenum.h"
+
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
+    #include "wx/string.h"
 #endif
 
-#include "wx/string.h"
 #include "wx/utils.h"
 
-#include "wx/fontenum.h"
 #include "wx/encinfo.h"
 #include "wx/fontutil.h"
 

src/mgl/utils.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        utils.cpp
+// Name:        src/mgl/utils.cpp
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
@@ -15,7 +15,10 @@
 #endif
 
 #include "wx/utils.h"
-#include "wx/string.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+#endif
 
 #include "wx/intl.h"
 #include "wx/apptrait.h"

src/motif/accel.cpp

@@ -13,7 +13,11 @@
 #include "wx/wxprec.h"
 
 #include "wx/accel.h"
-#include "wx/string.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+#endif
+
 #include "wx/utils.h"
 #include <ctype.h>
 

src/motif/font.cpp

@@ -29,8 +29,12 @@
 #pragma message enable nosimpint
 #endif
 
-#include "wx/string.h"
 #include "wx/font.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+#endif
+
 #include "wx/gdicmn.h"
 #include "wx/utils.h"       // for wxGetDisplay()
 #include "wx/fontutil.h"    // for wxNativeFontInfo

src/msdos/utilsdos.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        utils.cpp
+// Name:        src/msdos/utils.cpp
 // Purpose:     DOS implementations of utility functions
 // Author:      Vaclav Slavik, M.J.Wetherell
 // Id:          $Id$
@@ -16,7 +16,10 @@
 #endif
 
 #include "wx/utils.h"
-#include "wx/string.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+#endif
 
 #include "wx/intl.h"
 #include "wx/apptrait.h"
@@ -85,12 +88,12 @@ bool wxGetEnv(const wxString& var, wxString *value)
     // wxGetenv is defined as getenv()
     wxChar *p = wxGetenv(var);
     if ( !p )
-        return FALSE;
+        return false;
 
     if ( value )
         *value = p;
 
-    return TRUE;
+    return true;
 }
 
 bool wxSetEnv(const wxString& variable, const wxChar *value)

src/msw/dcclient.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcclient.cpp
+// Name:        src/msw/dcclient.cpp
 // Purpose:     wxClientDC class
 // Author:      Julian Smart
 // Modified by:
@@ -24,14 +24,17 @@
     #pragma hdrstop
 #endif
 
-#include "wx/string.h"
+#include "wx/dcclient.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+#endif
+
 #include "wx/log.h"
 #include "wx/window.h"
 
 #include "wx/msw/private.h"
 
-#include "wx/dcclient.h"
-
 // ----------------------------------------------------------------------------
 // array/list types
 // ----------------------------------------------------------------------------
@@ -353,4 +356,3 @@ wxPaintDCEx::~wxPaintDCEx()
     // prevent the base class dtor from ReleaseDC()ing it again
     m_hDC = 0;
 }
-

src/msw/joystick.cpp

@@ -13,13 +13,17 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #if wxUSE_JOYSTICK
 
 #include "wx/joystick.h"
-#include "wx/string.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+#endif
+
 #include "wx/window.h"
 #include "wx/msw/private.h"
 

src/msw/registry.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        msw/registry.cpp
+// Name:        src/msw/registry.cpp
 // Purpose:     implementation of registry classes and functions
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -16,11 +16,13 @@
 #include  "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
 #endif
 
-// other wxWidgets headers
-#include  "wx/string.h"
 #include  "wx/intl.h"
 #include  "wx/log.h"
 #include  "wx/file.h"
@@ -1413,4 +1415,3 @@ void RemoveTrailingSeparator(wxString& str)
   if ( !str.empty() && str.Last() == REG_SEPARATOR )
     str.Truncate(str.Len() - 1);
 }
-

src/msw/urlmsw.cpp

@@ -20,6 +20,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/list.h"
+    #include "wx/string.h"
 #endif
 
 #if !wxUSE_PROTOCOL_HTTP
@@ -63,7 +64,6 @@ USE_PROTOCOL(wxHTTPDummyProto)
     #pragma comment(lib, "wininet.lib")
 #endif
 
-#include "wx/string.h"
 #include "wx/utils.h"
 #include "wx/module.h"
 #include "wx/url.h"

src/os2/dcclient.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcclient.cpp
+// Name:        src/os2/dcclient.cpp
 // Purpose:     wxClientDC class
 // Author:      David Webster
 // Modified by:
@@ -20,15 +20,18 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/string.h"
+#include "wx/dcclient.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+#endif
+
 #include "wx/log.h"
 #include "wx/window.h"
 #include "wx/app.h"
 
 #include "wx/os2/private.h"
 
-#include "wx/dcclient.h"
-
 // ----------------------------------------------------------------------------
 // array/list types
 // ----------------------------------------------------------------------------
@@ -362,7 +365,7 @@ wxPaintDC::wxPaintDC(
                                 );
         }
 
-        m_bIsPaintTime   = TRUE;
+        m_bIsPaintTime   = true;
         ms_cache.Add(new wxPaintDCInfo(m_pCanvas, this));
     }
     InitDC();
@@ -383,7 +386,7 @@ wxPaintDC::~wxPaintDC()
         {
             ::WinEndPaint(m_hPS);
             m_hPS          = m_hOldPS;
-            m_bIsPaintTime = FALSE;
+            m_bIsPaintTime = false;
             ms_cache.RemoveAt(nIndex);
         }
         //else: cached DC entry is still in use
@@ -431,4 +434,3 @@ WXHDC wxPaintDC::FindDCInCache(
     }
     return 0;
 } // end of wxPaintDC::FindInCache
-

src/os2/dcprint.cpp

@@ -12,23 +12,24 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_PRINTING_ARCHITECTURE
+
 #define INCL_DEV
 #define INCL_GPI
 #define INCL_PM
 #include<os2.h>
 
+#include "wx/dcprint.h"
+
 #ifndef WX_PRECOMP
-#include "wx/app.h"
+    #include "wx/app.h"
-#include "wx/math.h"
+    #include "wx/math.h"
+    #include "wx/string.h"
 #endif
 
-#include "wx/string.h"
 #include "wx/log.h"
 #include "wx/window.h"
 #include "wx/os2/private.h"
-#include "wx/dcprint.h"
-
-#if wxUSE_PRINTING_ARCHITECTURE
 
 IMPLEMENT_CLASS(wxPrinterDC, wxDC)
 

src/os2/joystick.cpp

@@ -9,14 +9,17 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-//
 // For compilers that support precompilation, includes "wx.h".
-//
 #include "wx/wxprec.h"
 
 #if wxUSE_JOYSTICK
 
-#include "wx/string.h"
+#include "wx/joystick.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+#endif
+
 #define INCL_PM
 #define INCL_DOS
 #include "wx/os2/private.h"
@@ -24,7 +27,6 @@
 #define NO_JOYGETPOSEX
 
 #include "wx/window.h"
-#include "wx/joystick.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 
@@ -287,4 +289,5 @@ bool wxJoystick::ReleaseCapture()
     // TODO
     return false;
 }
+
 #endif  // wxUSE_JOYSTICK

src/palmos/dcclient.cpp

@@ -24,12 +24,15 @@
     #pragma hdrstop
 #endif
 
-#include "wx/string.h"
+#include "wx/dcclient.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+#endif
+
 #include "wx/log.h"
 #include "wx/window.h"
 
-#include "wx/dcclient.h"
-
 // ----------------------------------------------------------------------------
 // array/list types
 // ----------------------------------------------------------------------------
@@ -156,4 +159,3 @@ wxPaintDCEx::wxPaintDCEx(wxWindow *canvas, WXHDC dc) : saveState(0)
 wxPaintDCEx::~wxPaintDCEx()
 {
 }
-

src/palmos/joystick.cpp

@@ -12,13 +12,15 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __BORLANDC__
+#if wxUSE_JOYSTICK
-#pragma hdrstop
+
+#include "wx/joystick.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
 #endif
 
-#include "wx/string.h"
 #include "wx/window.h"
-#include "wx/palmos/joystick.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 
@@ -27,7 +29,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 
 wxJoystick::wxJoystick(int joystick)
 {
-};
+}
 
 wxPoint wxJoystick::GetPosition() const
 {
@@ -245,3 +247,4 @@ bool wxJoystick::ReleaseCapture()
     return false;
 }
 
+#endif  // wxUSE_JOYSTICK

src/unix/fontenum.cpp

@@ -20,16 +20,17 @@
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/fontenum.h"
+
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
+    #include "wx/string.h"
 #endif
 
-#include "wx/string.h"
 #include "wx/regex.h"
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/fontmap.h"
-#include "wx/fontenum.h"
 #include "wx/fontutil.h"
 #include "wx/encinfo.h"
 

src/x11/font.cpp

@@ -29,8 +29,12 @@
 #pragma message enable nosimpint
 #endif
 
-#include "wx/string.h"
 #include "wx/font.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+#endif
+
 #include "wx/gdicmn.h"
 #include "wx/utils.h"       // for wxGetDisplay()
 #include "wx/fontutil.h"    // for wxNativeFontInfo

src/xrc/xh_statbar.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_statbar.cpp
+// Name:        src/xrc/xh_statbar.cpp
 // Purpose:     XRC resource for wxStatusBar
 // Author:      Brian Ravnsgaard Riis
 // Created:     2004/01/21
@@ -17,11 +17,15 @@
 
 #if wxUSE_XRC && wxUSE_STATUSBAR
 
+#include "wx/xrc/xh_statbar.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+#endif
+
 #include "wx/frame.h"
-#include "wx/string.h"
 #include "wx/log.h"
 
-#include "wx/xrc/xh_statbar.h"
 #include "wx/statusbr.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxStatusBarXmlHandler, wxXmlResourceHandler)
@@ -62,7 +66,7 @@ wxObject *wxStatusBarXmlHandler::DoCreateResource()
     else
         statbar->SetFieldsCount(fields);
 
-    if (!styles.IsEmpty())
+    if (!styles.empty())
     {
         int *style = new int[fields];
         for (int i = 0; i < fields; ++i)
@@ -77,7 +81,7 @@ wxObject *wxStatusBarXmlHandler::DoCreateResource()
             else if (first == wxT("wxSB_RAISED"))
                 style[i] = wxSB_RAISED;
 
-            if (!first.IsEmpty())
+            if (!first.empty())
                 wxLogError(wxT("Error in resource, unknown statusbar field style: ") + first);
             if(styles.Find(wxT(',')))
                 styles.Remove(0, styles.Find(wxT(',')) + 1);
@@ -102,4 +106,3 @@ bool wxStatusBarXmlHandler::CanHandle(wxXmlNode *node)
 }
 
 #endif // wxUSE_XRC && wxUSE_STATUSBAR
-