Include wx/msw/wrap*.h according to pch support (with other minor cleaning).

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

include/wx/msw/wrapcctl.h

@@ -34,6 +34,8 @@
     #define _WIN32_IE 0x0600
 #endif // !defined(_WIN32_IE)
 
+#include "wx/msw/wrapwin.h"
+
 #include <commctrl.h>
 
 // define things which might be missing from our commctrl.h

src/common/appbase.cpp

@@ -25,6 +25,9 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #ifdef __WXMSW__
+        #include  "wx/msw/wrapwin.h"  // includes windows.h for MessageBox()
+    #endif
     #include "wx/list.h"
     #include "wx/app.h"
     #include "wx/intl.h"
@@ -43,10 +46,6 @@
   #include  <signal.h>      // for SIGTRAP used by wxTrap()
 #endif  //Win/Unix
 
-#if defined(__WXMSW__)
-  #include  "wx/msw/wrapwin.h"  // includes windows.h for MessageBox()
-#endif
-
 #if wxUSE_FONTMAP
     #include "wx/fontmap.h"
 #endif // wxUSE_FONTMAP

src/common/cmndata.cpp

@@ -27,6 +27,9 @@
 #include "wx/cmndata.h"
 
 #ifndef WX_PRECOMP
+    #if defined(__WXMSW__)
+        #include "wx/msw/wrapcdlg.h"
+    #endif // MSW
     #include <stdio.h>
     #include "wx/string.h"
     #include "wx/utils.h"
@@ -43,26 +46,21 @@
 #endif // wxUSE_FONTDLG
 
 #if wxUSE_PRINTING_ARCHITECTURE
-    #include "wx/paper.h"
-#endif // wxUSE_PRINTING_ARCHITECTURE
 
-#if defined(__WXMSW__)
+#include "wx/paper.h"
-    #include "wx/msw/wrapcdlg.h"
-#endif // MSW
-
-    #if wxUSE_PRINTING_ARCHITECTURE
 
 #if defined(__WXMAC__)
     #include "wx/mac/private/print.h"
 #endif
 
-        IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
-        IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject)
-        IMPLEMENT_DYNAMIC_CLASS(wxPageSetupDialogData, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxPageSetupDialogData, wxObject)
-    #endif // wxUSE_PRINTING_ARCHITECTURE
 
-    IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
+#endif // wxUSE_PRINTING_ARCHITECTURE
-    IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
+
+IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
 
 // ============================================================================
 // implementation

src/common/datetime.cpp

@@ -66,6 +66,9 @@
 #if !defined(wxUSE_DATETIME) || wxUSE_DATETIME
 
 #ifndef WX_PRECOMP
+    #ifdef __WXMSW__
+        #include "wx/msw/wrapwin.h"
+    #endif
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"
@@ -79,7 +82,6 @@
 #include <ctype.h>
 
 #ifdef __WINDOWS__
-    #include "wx/msw/wrapwin.h"
     #include <winnls.h>
     #ifndef __WXWINCE__
         #include <locale.h>

src/common/filename.cpp

@@ -68,6 +68,9 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #ifdef __WXMSW__
+        #include "wx/msw/wrapwin.h" // For GetShort/LongPathName
+    #endif
     #include "wx/dynarray.h"
     #include "wx/intl.h"
     #include "wx/log.h"
@@ -81,12 +84,8 @@
 #include "wx/file.h"
 #include "wx/dynlib.h"
 
-// For GetShort/LongPathName
+#if defined(__WIN32__) && defined(__MINGW32__)
-#ifdef __WIN32__
+    #include "wx/msw/gccpriv.h"
-#include "wx/msw/wrapwin.h"
-#if defined(__MINGW32__)
-#include "wx/msw/gccpriv.h"
-#endif
 #endif
 
 #ifdef __WXWINCE__

src/common/imagbmp.cpp

@@ -17,6 +17,9 @@
 #if wxUSE_IMAGE
 
 #ifndef WX_PRECOMP
+    #ifdef __WXMSW__
+        #include "wx/msw/wrapwin.h"
+    #endif
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/bitmap.h"
@@ -38,10 +41,6 @@
 #endif
 #endif
 
-#ifdef __WXMSW__
-#include "wx/msw/wrapwin.h"
-#endif
-
 //-----------------------------------------------------------------------------
 // wxBMPHandler
 //-----------------------------------------------------------------------------

src/common/memory.cpp

@@ -21,6 +21,9 @@
 #include "wx/memory.h"
 
 #ifndef WX_PRECOMP
+    #ifdef __WXMSW__
+        #include "wx/msw/wrapwin.h"
+    #endif
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/hash.h"
@@ -43,19 +46,6 @@
 #include <stdarg.h>
 #include <string.h>
 
-#ifdef __WXMSW__
-#include "wx/msw/wrapwin.h"
-
-#ifdef GetClassInfo
-#undef GetClassInfo
-#endif
-
-#ifdef GetClassName
-#undef GetClassName
-#endif
-
-#endif
-
 #if wxUSE_THREADS && defined(__WXDEBUG__)
 #define USE_THREADSAFE_MEMORY_ALLOCATION 1
 #else

src/common/paper.cpp

@@ -18,8 +18,10 @@
 
 #if wxUSE_PRINTING_ARCHITECTURE
 
-
 #ifndef WX_PRECOMP
+    #if defined(__WXMSW__)
+        #include "wx/msw/wrapcdlg.h"
+    #endif // MSW
     #include "wx/utils.h"
     #include "wx/settings.h"
     #include "wx/intl.h"
@@ -32,7 +34,6 @@
 #include <string.h>
 
 #ifdef __WXMSW__
-    #include "wx/msw/wrapcdlg.h"
     #ifndef __WIN32__
         #include <print.h>
     #endif

src/common/prntbase.cpp

@@ -21,6 +21,9 @@
 #include "wx/dcprint.h"
 
 #ifndef WX_PRECOMP
+    #if defined(__WXMSW__)
+        #include "wx/msw/wrapcdlg.h"
+    #endif // MSW
     #include "wx/utils.h"
     #include "wx/dc.h"
     #include "wx/app.h"
@@ -54,7 +57,6 @@
 #endif
 
 #ifdef __WXMSW__
-    #include "wx/msw/wrapcdlg.h"
     #ifndef __WIN32__
         #include <print.h>
     #endif

src/common/stopwatch.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        common/stopwatch.cpp
+// Name:        src/common/stopwatch.cpp
 // Purpose:     wxStopWatch and other non-GUI stuff from wx/timer.h
 // Author:
 //    Original version by Julian Smart
@@ -31,6 +31,9 @@
 #include "wx/stopwatch.h"
 
 #ifndef WX_PRECOMP
+    #ifdef __WXMSW__
+        #include "wx/msw/wrapwin.h"
+    #endif
     #include "wx/intl.h"
     #include "wx/log.h"
 #endif //WX_PRECOMP
@@ -39,10 +42,6 @@
 // System headers
 // ----------------------------------------------------------------------------
 
-#if defined(__WIN32__)
-    #include "wx/msw/wrapwin.h"
-#endif
-
 #if defined(__WIN32__) && !defined(HAVE_FTIME) && !defined(__MWERKS__) && !defined(__WXWINCE__)
     #define HAVE_FTIME
 #endif
@@ -371,5 +370,3 @@ double wxGetLocalTimeMillis(void)
 }
 
 #endif // wxUSE_LONGLONG/!wxUSE_LONGLONG
-
-

src/common/strconv.cpp

@@ -16,6 +16,9 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
+    #ifdef __WXMSW__
+        #include "wx/msw/missing.h"
+    #endif
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"
@@ -28,7 +31,6 @@
 
 #ifdef __WINDOWS__
     #include "wx/msw/private.h"
-    #include "wx/msw/missing.h"
 #endif
 
 #ifndef __WXWINCE__

src/generic/datavgen.cpp

@@ -21,6 +21,9 @@
 #ifdef wxUSE_GENERICDATAVIEWCTRL
 
 #ifndef WX_PRECOMP
+    #ifdef __WXMSW__
+        #include "wx/msw/wrapwin.h"
+    #endif
     #include "wx/sizer.h"
     #include "wx/log.h"
     #include "wx/dcclient.h"
@@ -33,10 +36,6 @@
 #include "wx/popupwin.h"
 #include "wx/renderer.h"
 
-#ifdef __WXMSW__
-    #include "wx/msw/wrapwin.h"
-#endif
-
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------

src/generic/filedlgg.cpp

@@ -24,6 +24,9 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #ifdef __WXMSW__
+        #include "wx/msw/wrapwin.h"
+    #endif
     #include "wx/hash.h"
     #include "wx/intl.h"
     #include "wx/settings.h"
@@ -67,7 +70,6 @@
 #endif
 
 #ifdef __WINDOWS__
-    #include "wx/msw/wrapwin.h"
     #include "wx/msw/mslu.h"
 #endif
 

src/msw/app.cpp

@@ -25,6 +25,7 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h"
     #include "wx/dynarray.h"
     #include "wx/frame.h"
     #include "wx/app.h"
@@ -76,8 +77,6 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "wx/msw/wrapcctl.h"
-
 // For MB_TASKMODAL
 #ifdef __WXWINCE__
 #include "wx/msw/wince/missing.h"

src/msw/checklst.cpp

@@ -29,6 +29,7 @@
 #include "wx/checklst.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapwin.h"
     #include "wx/object.h"
     #include "wx/colour.h"
     #include "wx/font.h"
@@ -36,15 +37,12 @@
     #include "wx/window.h"
     #include "wx/listbox.h"
     #include "wx/dcmemory.h"
-
     #include "wx/settings.h"
-
     #include "wx/log.h"
 #endif
 
 #include "wx/ownerdrw.h"
 
-#include "wx/msw/wrapwin.h"
 #include <windowsx.h>
 
 #include "wx/msw/private.h"

src/msw/colordlg.cpp

@@ -29,6 +29,7 @@
 #include "wx/colordlg.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcdlg.h"
     #include <stdio.h>
     #include "wx/colour.h"
     #include "wx/gdicmn.h"
@@ -39,7 +40,6 @@
 #endif
 
 #include "wx/msw/private.h"
-#include "wx/msw/wrapcdlg.h"
 
 #include <stdlib.h>
 #include <string.h>

src/msw/combobox.cpp

@@ -29,6 +29,7 @@
 #include "wx/combobox.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
     #include "wx/settings.h"
     #include "wx/log.h"
     // for wxEVT_COMMAND_TEXT_ENTER
@@ -40,9 +41,6 @@
 #include "wx/clipbrd.h"
 #include "wx/msw/private.h"
 
-// include <commctrl.h> "properly"
-#include "wx/msw/wrapcctl.h"
-
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
 #endif // wxUSE_TOOLTIPS

src/msw/control.cpp

@@ -29,6 +29,7 @@
 #include "wx/control.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/dcclient.h"
@@ -47,9 +48,6 @@
 #include "wx/msw/private.h"
 #include "wx/msw/uxtheme.h"
 
-// include <commctrl.h> "properly"
-#include "wx/msw/wrapcctl.h"
-
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------

src/msw/cursor.cpp

@@ -27,6 +27,7 @@
 #include "wx/cursor.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/missing.h" // IDC_HAND
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/bitmap.h"
@@ -38,7 +39,6 @@
 #endif
 
 #include "wx/msw/private.h"
-#include "wx/msw/missing.h" // IDC_HAND
 
 // define functions missing in MicroWin
 #ifdef __WXMICROWIN__

src/msw/datectrl.cpp

@@ -26,11 +26,11 @@
 #if wxUSE_DATEPICKCTRL
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapwin.h"
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/dcclient.h"
-    #include "wx/msw/wrapwin.h"
-    #include "wx/msw/wrapcctl.h"
     #include "wx/msw/private.h"
 #endif
 

src/msw/dc.cpp

@@ -25,6 +25,7 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcdlg.h"
     #include "wx/image.h"
     #include "wx/window.h"
     #include "wx/dc.h"
@@ -48,7 +49,6 @@
 
 #include <string.h>
 
-#include "wx/msw/wrapcdlg.h"
 #ifndef __WIN32__
     #include <print.h>
 #endif

src/msw/dcprint.cpp

@@ -29,6 +29,7 @@
 #include "wx/dcprint.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcdlg.h"
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/window.h"
@@ -45,7 +46,6 @@
 #include "wx/printdlg.h"
 #include "wx/msw/printdlg.h"
 
-#include "wx/msw/wrapcdlg.h"
 #ifndef __WIN32__
     #include <print.h>
 #endif

src/msw/dialog.cpp

@@ -27,6 +27,7 @@
 #include "wx/dialog.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcdlg.h"
     #include "wx/utils.h"
     #include "wx/frame.h"
     #include "wx/app.h"
@@ -41,8 +42,6 @@
 #include "wx/evtloop.h"
 #include "wx/ptr_scpd.h"
 
-#include "wx/msw/wrapcdlg.h"
-
 #if defined(__SMARTPHONE__) && defined(__WXWINCE__)
     #include "wx/msw/wince/resources.h"
 #endif // __SMARTPHONE__ && __WXWINCE__

src/msw/display.cpp

@@ -28,13 +28,12 @@
 #if wxUSE_DISPLAY
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/missing.h"
     #include "wx/dynarray.h"
     #include "wx/app.h"
     #include "wx/frame.h"
 #endif
 
-#include "wx/msw/missing.h"
-
 #include "wx/dynload.h"
 #include "wx/sysopt.h"
 
@@ -459,7 +458,7 @@ wxRect wxDisplayImplWin32Base::GetClientArea() const
 
 wxString wxDisplayImplWin32Base::GetName() const
 {
-    if ( m_info.m_devName.IsEmpty() )
+    if ( m_info.m_devName.empty() )
         m_info.Initialize();
 
     return m_info.m_devName;

src/msw/dragimag.cpp

@@ -27,6 +27,7 @@
 #if wxUSE_DRAGIMAGE
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
     #include <stdio.h>
     #include "wx/window.h"
     #include "wx/dcclient.h"
@@ -48,9 +49,6 @@
 #include "wx/msw/wince/missing.h"
 #endif // __WXWINCE__
 
-// include <commctrl.h> "properly"
-#include "wx/msw/wrapcctl.h"
-
 // Wine doesn't have this yet
 #ifndef ListView_CreateDragImage
 #define ListView_CreateDragImage(hwnd, i, lpptUpLeft) \

src/msw/fdrepdlg.cpp

@@ -4,7 +4,7 @@
 // Author:      Markus Greither and Vadim Zeitlin
 // Modified by:
 // Created:     23/03/2001
-// RCS-ID:
+// RCS-ID:      $Id$
 // Copyright:   (c) Markus Greither
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -27,11 +27,11 @@
 #if wxUSE_FINDREPLDLG
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcdlg.h"
     #include "wx/intl.h"
     #include "wx/log.h"
 #endif
 
-#include "wx/msw/wrapcdlg.h"
 #include "wx/fdrepdlg.h"
 
 // ----------------------------------------------------------------------------
@@ -539,4 +539,3 @@ void wxFindReplaceDialog::DoGetClientSize(int *width, int *height) const
 }
 
 #endif // wxUSE_FINDREPLDLG
-

src/msw/filedlg.cpp

@@ -29,6 +29,8 @@
 #include "wx/filedlg.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcdlg.h"
+    #include "wx/msw/missing.h"
     #include "wx/utils.h"
     #include "wx/msgdlg.h"
     #include "wx/filefn.h"
@@ -38,16 +40,12 @@
     #include "wx/math.h"
 #endif
 
-#include "wx/msw/wrapcdlg.h"
-
 #include <stdlib.h>
 #include <string.h>
 
 #include "wx/filename.h"
 #include "wx/tokenzr.h"
 
-#include "wx/msw/missing.h"
-
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------

src/msw/fontdlg.cpp

@@ -29,6 +29,7 @@
 #include "wx/fontdlg.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcdlg.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/log.h"
@@ -36,8 +37,6 @@
     #include "wx/math.h"
 #endif
 
-#include "wx/msw/wrapcdlg.h"
-
 #include <stdlib.h>
 #include <string.h>
 

src/msw/frame.cpp

@@ -27,6 +27,7 @@
 #include "wx/frame.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
     #include "wx/app.h"
     #include "wx/menu.h"
     #include "wx/utils.h"
@@ -43,9 +44,6 @@
 
 #include "wx/msw/private.h"
 
-// include <commctrl.h> "properly"
-#include "wx/msw/wrapcctl.h"
-
 #if defined(__POCKETPC__) || defined(__SMARTPHONE__)
     #include <ole2.h>
     #include <aygshell.h>

src/msw/gauge95.cpp

@@ -29,13 +29,11 @@
 #include "wx/gauge.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
 #endif
 
 #include "wx/msw/private.h"
 
-// include <commctrl.h> "properly"
-#include "wx/msw/wrapcctl.h"
-
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------

src/msw/imaglist.cpp

@@ -25,6 +25,7 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
     #include "wx/window.h"
     #include "wx/icon.h"
     #include "wx/dc.h"
@@ -39,9 +40,6 @@
 #include "wx/msw/imaglist.h"
 #include "wx/msw/private.h"
 
-// include <commctrl.h> "properly"
-#include "wx/msw/wrapcctl.h"
-
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------

src/msw/iniconf.cpp

@@ -21,13 +21,14 @@
 #if wxUSE_CONFIG && !wxUSE_UNICODE
 
 #ifndef   WX_PRECOMP
-    #include  "wx/dynarray.h"
+    #include "wx/msw/wrapwin.h"
-    #include  "wx/string.h"
+    #include "wx/dynarray.h"
-    #include  "wx/intl.h"
+    #include "wx/string.h"
-    #include  "wx/event.h"
+    #include "wx/intl.h"
-    #include  "wx/app.h"
+    #include "wx/event.h"
-    #include  "wx/utils.h"
+    #include "wx/app.h"
-    #include  "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/log.h"
 #endif  //WX_PRECOMP
 
 #include  "wx/config.h"
@@ -35,12 +36,6 @@
 
 #include  "wx/msw/iniconf.h"
 
-// _WINDOWS_ is defined when windows.h is included,
-// __WXMSW__ is defined for MS Windows compilation
-#if       defined(__WXMSW__) && !defined(_WINDOWS_)
-  #include  "wx/msw/wrapwin.h"
-#endif  //windows.h
-
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------

src/msw/listctrl.cpp

@@ -27,6 +27,7 @@
 #if wxUSE_LISTCTRL
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
@@ -48,9 +49,6 @@
   #endif
 #endif
 
-// include <commctrl.h> "properly"
-#include "wx/msw/wrapcctl.h"
-
 // Currently gcc and watcom don't define NMLVFINDITEM, and DMC only defines
 // it by its old name NM_FINDTIEM.
 //

src/msw/menu.cpp

@@ -29,6 +29,7 @@
 #include "wx/menu.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
     #include "wx/frame.h"
     #include "wx/utils.h"
     #include "wx/intl.h"
@@ -41,9 +42,6 @@
 
 #include "wx/msw/private.h"
 
-// include <commctrl.h> "properly"
-#include "wx/msw/wrapcctl.h"
-
 #ifdef __WXWINCE__
 #include <windows.h>
 #include <windowsx.h>

src/msw/notebook.cpp

@@ -18,30 +18,28 @@
 
 #if wxUSE_NOTEBOOK
 
-#include  "wx/notebook.h"
+#include "wx/notebook.h"
 
 #ifndef WX_PRECOMP
-    #include  "wx/string.h"
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
-    #include  "wx/dc.h"
+    #include "wx/string.h"
-    #include  "wx/log.h"
+    #include "wx/dc.h"
-    #include  "wx/event.h"
+    #include "wx/log.h"
-    #include  "wx/app.h"
+    #include "wx/event.h"
-    #include  "wx/dcclient.h"
+    #include "wx/app.h"
-    #include  "wx/dcmemory.h"
+    #include "wx/dcclient.h"
-    #include  "wx/control.h"
+    #include "wx/dcmemory.h"
+    #include "wx/control.h"
 #endif  // WX_PRECOMP
 
-#include  "wx/imaglist.h"
+#include "wx/imaglist.h"
-#include  "wx/sysopt.h"
+#include "wx/sysopt.h"
 
-#include  "wx/msw/private.h"
+#include "wx/msw/private.h"
 
-#include  <windowsx.h>
+#include <windowsx.h>
 #include "wx/msw/winundef.h"
 
-// include <commctrl.h> "properly"
-#include "wx/msw/wrapcctl.h"
-
 #if wxUSE_UXTHEME
     #include "wx/msw/uxtheme.h"
 #endif

src/msw/ole/access.cpp

@@ -29,12 +29,11 @@
 #include "wx/access.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapwin.h"
     #include "wx/window.h"
     #include "wx/log.h"
 #endif
 
-#include "wx/msw/wrapwin.h"
-
 // for some compilers, the entire ole2.h must be included, not only oleauto.h
 #if wxUSE_NORLANDER_HEADERS || defined(__WATCOMC__)
     #include <ole2.h>

src/msw/ole/droptgt.cpp

@@ -27,6 +27,7 @@
 #if wxUSE_OLE && wxUSE_DRAG_AND_DROP
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapwin.h"
     #include "wx/log.h"
 #endif
 
@@ -39,9 +40,6 @@
 
 #ifdef __WIN32__
     #if !defined(__GNUWIN32__) || wxUSE_NORLANDER_HEADERS
-        #if wxCHECK_W32API_VERSION( 1, 0 )
-            #include "wx/msw/wrapwin.h"
-        #endif
         #include <shlobj.h>            // for DROPFILES structure
     #endif
 #else

src/msw/ole/uuid.cpp

@@ -22,10 +22,10 @@
 
 #if wxUSE_OLE && ( wxUSE_DRAG_AND_DROP || (defined(__WXDEBUG__) && wxUSE_DATAOBJ) )
 
-// standard headers
+#ifndef WX_PRECOMP
-#if wxCHECK_W32API_VERSION( 1, 0 )
     #include "wx/msw/wrapwin.h"
 #endif
+
 #include  <rpc.h>                       // UUID related functions
 
 #include  "wx/msw/ole/uuid.h"

src/msw/printdlg.cpp

@@ -29,6 +29,7 @@
 #if wxUSE_PRINTING_ARCHITECTURE && (!defined(__WXUNIVERSAL__) || !wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcdlg.h"
     #include "wx/app.h"
     #include "wx/dcprint.h"
     #include "wx/cmndata.h"
@@ -40,8 +41,6 @@
 
 #include <stdlib.h>
 
-#include "wx/msw/wrapcdlg.h"
-
 #ifndef __WIN32__
     #include <print.h>
 #endif

src/msw/printwin.cpp

@@ -29,6 +29,7 @@
 #if wxUSE_PRINTING_ARCHITECTURE && (!defined(__WXUNIVERSAL__) || !wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcdlg.h"
     #include "wx/window.h"
     #include "wx/msw/private.h"
     #include "wx/utils.h"
@@ -46,7 +47,6 @@
 
 #include <stdlib.h>
 
-#include "wx/msw/wrapcdlg.h"
 #ifndef __WIN32__
     #include <print.h>
 #endif

src/msw/registry.cpp

@@ -20,17 +20,16 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapwin.h"
     #include "wx/string.h"
-    #include  "wx/intl.h"
+    #include "wx/intl.h"
-    #include  "wx/log.h"
+    #include "wx/log.h"
 #endif
 
-#include  "wx/file.h"
+#include "wx/file.h"
-#include  "wx/wfstream.h"
+#include "wx/wfstream.h"
 
 // Windows headers
-#include  "wx/msw/wrapwin.h"
-
 #ifdef __WXWINCE__
 #include "wx/msw/private.h"
 #include <winbase.h>

src/msw/settings.cpp

@@ -27,6 +27,7 @@
 #include "wx/settings.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/missing.h" // for SM_CXCURSOR, SM_CYCURSOR, SM_TABLETPC
     #include "wx/utils.h"
     #include "wx/gdicmn.h"
     #include "wx/module.h"
@@ -40,9 +41,6 @@
 
 #include "wx/fontutil.h"
 
-// for SM_CXCURSOR, SM_CYCURSOR, SM_TABLETPC
-#include "wx/msw/missing.h"
-
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------

src/msw/slider95.cpp

@@ -30,14 +30,12 @@
 #include "wx/slider.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
     #include "wx/brush.h"
 #endif
 
 #include "wx/msw/subwin.h"
 
-// include <commctrl.h> "properly"
-#include "wx/msw/wrapcctl.h"
-
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------

src/msw/spinbutt.cpp

@@ -25,6 +25,7 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
     #include "wx/app.h"
 #endif
 
@@ -35,7 +36,6 @@
 IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
 
 #include "wx/msw/private.h"
-#include "wx/msw/wrapcctl.h"
 
 #ifndef UDM_SETRANGE32
     #define UDM_SETRANGE32 (WM_USER+111)

src/msw/spinctrl.cpp

@@ -29,12 +29,12 @@
 #include "wx/spinctrl.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
     #include "wx/event.h"
     #include "wx/textctrl.h"
 #endif
 
 #include "wx/msw/private.h"
-#include "wx/msw/wrapcctl.h"
 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"

src/msw/statbox.cpp

@@ -29,6 +29,7 @@
 #include "wx/statbox.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/missing.h"
     #include "wx/app.h"
     #include "wx/dcclient.h"
     #include "wx/dcmemory.h"
@@ -40,7 +41,6 @@
 
 #include "wx/msw/uxtheme.h"
 #include "wx/msw/private.h"
-#include "wx/msw/missing.h"
 
 // ----------------------------------------------------------------------------
 // wxWin macros

src/msw/statbr95.cpp

@@ -21,6 +21,7 @@
 #include "wx/statusbr.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
     #include "wx/frame.h"
     #include "wx/settings.h"
     #include "wx/dcclient.h"
@@ -31,9 +32,6 @@
 #include "wx/msw/private.h"
 #include <windowsx.h>
 
-// include <commctrl.h> "properly"
-#include "wx/msw/wrapcctl.h"
-
 #if wxUSE_UXTHEME
     #include "wx/msw/uxtheme.h"
 #endif

src/msw/statline.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msw/statline.cpp
+// Name:        src/msw/statline.cpp
 // Purpose:     MSW version of wxStaticLine class
 // Author:      Vadim Zeitlin
 // Created:     28.06.99
@@ -27,8 +27,10 @@
 
 #if wxUSE_STATLINE
 
-#include "wx/msw/private.h"
+#ifndef WX_PRECOMP
-#include "wx/msw/missing.h"
+    #include "wx/msw/private.h"
+    #include "wx/msw/missing.h"
+#endif
 
 // ============================================================================
 // implementation
@@ -127,4 +129,3 @@ WXDWORD wxStaticLine::MSWGetStyle(long style, WXDWORD *exstyle) const
 }
 
 #endif // wxUSE_STATLINE
-

src/msw/tabctrl.cpp

@@ -19,15 +19,13 @@
 #if wxUSE_TAB_DIALOG
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
     #include "wx/wx.h"
     #include "wx/app.h"
 #endif
 
 #include "wx/msw/private.h"
 
-// include <commctrl.h> "properly"
-#include "wx/msw/wrapcctl.h"
-
 #include "wx/tabctrl.h"
 #include "wx/msw/imaglist.h"
 

src/msw/tbar95.cpp

@@ -29,6 +29,7 @@
 #include "wx/toolbar.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
     #include "wx/dynarray.h"
     #include "wx/frame.h"
     #include "wx/log.h"
@@ -49,9 +50,6 @@
 #include "wx/msw/uxtheme.h"
 #endif
 
-// include <commctrl.h> "properly"
-#include "wx/msw/wrapcctl.h"
-
 // this define controls whether the code for button colours remapping (only
 // useful for 16 or 256 colour images) is active at all, it's always turned off
 // for CE where it doesn't compile (and is probably not needed anyhow) and may

src/msw/textctrl.cpp

@@ -27,6 +27,7 @@
 #if wxUSE_TEXTCTRL && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/missing.h"
     #include "wx/textctrl.h"
     #include "wx/settings.h"
     #include "wx/brush.h"
@@ -71,8 +72,6 @@
     #include <richedit.h>
 #endif
 
-#include "wx/msw/missing.h"
-
 #endif // wxUSE_RICHEDIT
 
 // ----------------------------------------------------------------------------

src/msw/thread.cpp

@@ -26,6 +26,7 @@
 #include "wx/thread.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/missing.h"
     #include "wx/intl.h"
     #include "wx/app.h"
     #include "wx/module.h"
@@ -35,7 +36,6 @@
 #include "wx/scopeguard.h"
 
 #include "wx/msw/private.h"
-#include "wx/msw/missing.h"
 #include "wx/msw/seh.h"
 
 #include "wx/except.h"

src/msw/tooltip.cpp

@@ -28,6 +28,7 @@
 #include "wx/tooltip.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
     #include "wx/app.h"
     #include "wx/control.h"
     #include "wx/combobox.h"
@@ -36,9 +37,6 @@
 #include "wx/tokenzr.h"
 #include "wx/msw/private.h"
 
-// include <commctrl.h> "properly"
-#include "wx/msw/wrapcctl.h"
-
 // VZ: normally, the trick with subclassing the tooltip control and processing
 //     TTM_WINDOWFROMPOINT should work but, somehow, it doesn't. I leave the
 //     code here for now (but it's not compiled) in case we need it later.

src/msw/toplevel.cpp

@@ -27,6 +27,7 @@
 #include "wx/toplevel.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/missing.h"
     #include "wx/app.h"
     #include "wx/dialog.h"
     #include "wx/string.h"
@@ -50,7 +51,6 @@
     #include "wx/msw/wince/missing.h"
 #endif
 
-#include "wx/msw/missing.h"
 #include "wx/msw/winundef.h"
 
 #include "wx/display.h"

src/msw/treectrl.cpp

@@ -29,6 +29,8 @@
 #include "wx/treectrl.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
+    #include "wx/msw/missing.h"
     #include "wx/dynarray.h"
     #include "wx/log.h"
     #include "wx/app.h"
@@ -37,11 +39,6 @@
 
 #include "wx/msw/private.h"
 
-// include <commctrl.h> "properly"
-#include "wx/msw/wrapcctl.h"
-
-#include "wx/msw/missing.h"
-
 // Set this to 1 to be _absolutely_ sure that repainting will work for all
 // comctl32.dll versions
 #define wxUSE_COMCTL32_SAFELY 0

src/msw/utils.cpp

@@ -25,6 +25,7 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/missing.h"     // CHARSET_HANGUL
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/intl.h"
@@ -41,7 +42,6 @@
 #include "wx/confbase.h"        // for wxExpandEnvVars()
 
 #include "wx/msw/private.h"     // includes <windows.h>
-#include "wx/msw/missing.h"     // CHARSET_HANGUL
 
 #if defined(__CYGWIN__)
     //CYGWIN gives annoying warning about runtime stuff if we don't do this

src/msw/volume.cpp

@@ -26,6 +26,7 @@
 #if wxUSE_FSVOLUME
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/missing.h"
     #if wxUSE_GUI
         #include "wx/icon.h"
     #endif
@@ -41,7 +42,6 @@
 
 #include <shellapi.h>
 #include <shlobj.h>
-#include "wx/msw/missing.h"
 
 #if wxUSE_BASE
 

src/msw/wince/checklst.cpp

@@ -29,11 +29,9 @@
 #include "wx/checklst.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
 #endif
 
-// include <commctrl.h> "properly"
-#include "wx/msw/wrapcctl.h"
-
 // ============================================================================
 // implementation
 // ============================================================================

src/msw/wince/choicece.cpp

@@ -29,11 +29,9 @@
 #include "wx/choice.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
 #endif
 
-// include <commctrl.h> "properly"
-#include "wx/msw/wrapcctl.h"
-
 #include "wx/spinbutt.h" // for wxSpinnerBestSize
 
 #if wxUSE_EXTENDED_RTTI

src/msw/wince/helpwce.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        helpwce.h
+// Name:        src/msw/wince/helpwce.cpp
 // Purpose:     Help system: Windows CE help implementation
 // Author:      Julian Smart
 // Modified by:
@@ -22,11 +22,11 @@
 #include "wx/msw/wince/helpwce.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/missing.h"
     #include "wx/intl.h"
 #endif
 
 #include "wx/msw/private.h"
-#include "wx/msw/missing.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxWinceHelpController, wxHelpControllerBase)
 
@@ -38,7 +38,7 @@ bool wxWinceHelpController::Initialize(const wxString& filename)
 
 bool wxWinceHelpController::LoadFile(const wxString& file)
 {
-    if (!file.IsEmpty())
+    if (!file.empty())
         m_helpFile = file;
     return true;
 }
@@ -93,7 +93,7 @@ wxString wxWinceHelpController::GetValidFilename(const wxString& file) const
     wxSplitPath(file, & path, & name, & ext);
 
     wxString fullName;
-    if (path.IsEmpty())
+    if (path.empty())
         fullName = name + wxT(".htm");
     else if (path.Last() == wxT('\\'))
         fullName = path + name + wxT(".htm");
@@ -109,10 +109,10 @@ wxString wxWinceHelpController::GetValidFilename(const wxString& file) const
 // View URL
 bool wxWinceHelpController::ViewURL(const wxString& topic)
 {
-    if (m_helpFile.IsEmpty()) return false;
+    if (m_helpFile.empty()) return false;
 
     wxString url( wxT("file:") + GetValidFilename(m_helpFile) );
-    if (!topic.IsEmpty())
+    if (!topic.empty())
         url = url + wxT("#") + topic;
 
     return CreateProcess(wxT("peghelp.exe"),
@@ -121,4 +121,3 @@ bool wxWinceHelpController::ViewURL(const wxString& topic)
 }
 
 #endif // wxUSE_HELP
-

src/msw/wince/net.cpp

@@ -1,4 +1,13 @@
-// Copyright 1998, Ben Goetter.  All rights reserved.
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/msw/wince/net.cpp
+// Purpose:
+// Author:
+// Modified by:
+// Created:
+// RCS-ID:      $Id$
+// Copyright:   Copyright 1998, Ben Goetter.  All rights reserved.
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
 
 /*
  patch holes in winsock
@@ -19,7 +28,10 @@
     #pragma hdrstop
 #endif
 
-#include "wx/msw/wrapwin.h"
+#ifndef WX_PRECOMP
+    #include "wx/msw/wrapwin.h"
+#endif
+
 #include <tchar.h>
 #include <winsock.h>
 #include <string.h>
@@ -171,4 +183,3 @@ struct protoent * WINSOCKAPI getprotobynumber(int proto)
   ++pr;
  } return NULL;
 }
-

src/msw/wince/tbarwce.cpp

@@ -31,6 +31,7 @@
 #include "wx/toolbar.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
     #include "wx/dynarray.h"
     #include "wx/frame.h"
     #include "wx/log.h"
@@ -45,9 +46,6 @@
     #include "malloc.h"
 #endif
 
-// include <commctrl.h> "properly"
-#include "wx/msw/wrapcctl.h"
-
 #include "wx/msw/private.h"
 #include <windows.h>
 #include <windowsx.h>

src/msw/wince/textctrlce.cpp

@@ -29,11 +29,9 @@
 #include "wx/textctrl.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
 #endif
 
-// include <commctrl.h> "properly"
-#include "wx/msw/wrapcctl.h"
-
 #include "wx/spinbutt.h"
 #include "wx/textfile.h"
 

src/msw/window.cpp

@@ -28,6 +28,8 @@
 
 #ifndef WX_PRECOMP
     #include "wx/msw/wrapwin.h"
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
+    #include "wx/msw/missing.h"
     #include "wx/accel.h"
     #include "wx/menu.h"
     #include "wx/dc.h"
@@ -103,15 +105,10 @@
     #include <windowsx.h>
 #endif
 
-// include <commctrl.h> "properly"
-#include "wx/msw/wrapcctl.h"
-
 #if !defined __WXWINCE__ && !defined NEED_PBT_H
     #include <pbt.h>
 #endif
 
-#include "wx/msw/missing.h"
-
 #if defined(__WXWINCE__)
     #include "wx/msw/wince/missing.h"
 #ifdef __POCKETPC__