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

diff --git a/include/wx/msw/wrapcctl.h b/include/wx/msw/wrapcctl.h
index 0edf3d96ecdc20f75ba56bbf73f24609e45a6d68..65c17f4d1c399b04131350f00cf6fe4bbf043d77 100644 (file)
--- a/include/wx/msw/wrapcctl.h
+++ b/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

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index fa5db01ac9682e88b5ceeb0d0229e46368e2b7ae..40706d3aee03a262fed7419bc8da299e89eb8351 100644 (file)
--- a/src/common/appbase.cpp
+++ b/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

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index eb69bdb766f65076cab95364e530d68cd798877e..13b30b55798d482d795a631b356aa0b7e942fdfa 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/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/msw/wrapcdlg.h"
-#endif // MSW
 
-    #if wxUSE_PRINTING_ARCHITECTURE
+#include "wx/paper.h"
 
 #if defined(__WXMAC__)
     #include "wx/mac/private/print.h"
 #endif
 
-        IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
-        IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject)
-        IMPLEMENT_DYNAMIC_CLASS(wxPageSetupDialogData, wxObject)
-    #endif // wxUSE_PRINTING_ARCHITECTURE
+IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxPageSetupDialogData, wxObject)
+
+#endif // wxUSE_PRINTING_ARCHITECTURE
 
-    IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
-    IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
 
 // ============================================================================
 // implementation

diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp
index 069f1dbee33c961c4e582ac8ce6b62518118a38f..4e68a76cd23edd1388e046523804da8c2893fba3 100644 (file)
--- a/src/common/datetime.cpp
+++ b/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>

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 91451e445240f23de9d24069e09beda5e2bc49d7..b4ea82e56a960adea19bb2f8e4d83f6a000657de 100644 (file)
--- a/src/common/filename.cpp
+++ b/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
-#ifdef __WIN32__
-#include "wx/msw/wrapwin.h"
-#if defined(__MINGW32__)
-#include "wx/msw/gccpriv.h"
-#endif
+#if defined(__WIN32__) && defined(__MINGW32__)
+    #include "wx/msw/gccpriv.h"
 #endif
 
 #ifdef __WXWINCE__

diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp
index a500a84a9774a47fbc600c3e20a3798b92fc1cf8..0dced8f819f1d8776ba9836bb66992a40b0d57b4 100644 (file)
--- a/src/common/imagbmp.cpp
+++ b/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
 //-----------------------------------------------------------------------------

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index acd63dcde9aa6cab2d7ff7a353f1f0adf9f99b53..72169f2735aa64c1ee31a06f431fc199a968d43e 100644 (file)
--- a/src/common/memory.cpp
+++ b/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

diff --git a/src/common/paper.cpp b/src/common/paper.cpp
index fb2c1ca6d3ffa74011638a04728fc82e8ed4a0be..bc29b2acc19093209c3a116d643165ffa43f33b2 100644 (file)
--- a/src/common/paper.cpp
+++ b/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

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index eb1b10958326cfa944d4adf1c4c53f7a4427d202..a06698ac58686a2f254858b0a176bbcd6b34c295 100644 (file)
--- a/src/common/prntbase.cpp
+++ b/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

diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp
index 0739cf0f4bf2453d3d3cb456231d62176249d2e2..6e0754d2d089cd78a1f620fa09e7ee4a7b1754fa 100644 (file)
--- a/src/common/stopwatch.cpp
+++ b/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
-
-

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index b83ff1a3402bd864880510faa679cac03e2d693b..95ef4240421423b71948f04911ffcdd85067e4ad 100644 (file)
--- a/src/common/strconv.cpp
+++ b/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__
@@ -2773,7 +2775,7 @@ public:
             wxASSERT_MSG( status == noErr , _("Unable to create TextEncodingConverter")) ;
         }
     }
-    
+
     size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const
     {
         CreateIfNeeded() ;
@@ -2888,9 +2890,9 @@ public:
     virtual wxMBConv *Clone() const { return new wxMBConv_mac(*this); }
 
     bool IsOk() const
-    {         
+    {
         CreateIfNeeded() ;
-        return m_MB2WC_converter != NULL && m_WC2MB_converter != NULL; 
+        return m_MB2WC_converter != NULL && m_WC2MB_converter != NULL;
     }
 
 protected :
@@ -2906,13 +2908,13 @@ protected :
 class wxMBConv_macUTF8D : public wxMBConv_mac
 {
 public :
-    wxMBConv_macUTF8D() 
+    wxMBConv_macUTF8D()
     {
         Init( kTextEncodingUnicodeDefault , kUnicodeNoSubset , kUnicodeUTF8Format ) ;
         m_uni = NULL;
         m_uniBack = NULL ;
     }
-     
+
     virtual ~wxMBConv_macUTF8D()
     {
         if (m_uni!=NULL)
@@ -2920,7 +2922,7 @@ public :
         if (m_uniBack!=NULL)
             DisposeUnicodeToTextInfo(&m_uniBack);
     }
-    
+
     size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const
     {
         CreateIfNeeded() ;
@@ -2950,15 +2952,15 @@ public :
         ubuf = (UniChar*) psz ;
 #endif
 
-        // ubuf is a non-decomposed UniChar buffer 
-        
+        // ubuf is a non-decomposed UniChar buffer
+
         ByteCount dcubuflen = byteInLen * 2 + 2 ;
         ByteCount dcubufread , dcubufwritten ;
-        UniChar *dcubuf = (UniChar*) malloc( dcubuflen ) ; 
-       
-        ConvertFromUnicodeToText( m_uni , byteInLen , ubuf , 
+        UniChar *dcubuf = (UniChar*) malloc( dcubuflen ) ;
+
+        ConvertFromUnicodeToText( m_uni , byteInLen , ubuf ,
             kUnicodeDefaultDirectionMask, 0, NULL, NULL, NULL, dcubuflen  , &dcubufread , &dcubufwritten , dcubuf ) ;
-       
+
         // we now convert that decomposed buffer into UTF8
 
         status = TECConvertText(
@@ -2983,7 +2985,7 @@ public :
 
         return res ;
     }
-    
+
     size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const
     {
         CreateIfNeeded() ;
@@ -2993,25 +2995,25 @@ public :
         wchar_t *tbuf = NULL ;
         UniChar* ubuf = NULL ;
         size_t res = 0 ;
-        
+
         if (buf == NULL)
         {
             // Apple specs say at least 32
             n = wxMax( 32, byteInLen ) ;
             tbuf = (wchar_t*) malloc( n * SIZEOF_WCHAR_T ) ;
         }
-        
+
         ByteCount byteBufferLen = n * sizeof( UniChar ) ;
-        
+
 #if SIZEOF_WCHAR_T == 4
         ubuf = (UniChar*) malloc( byteBufferLen + 2 ) ;
 #else
         ubuf = (UniChar*) (buf ? buf : tbuf) ;
 #endif
-        
+
         ByteCount dcubuflen = byteBufferLen * 2 + 2 ;
         ByteCount dcubufread , dcubufwritten ;
-        UniChar *dcubuf = (UniChar*) malloc( dcubuflen ) ; 
+        UniChar *dcubuf = (UniChar*) malloc( dcubuflen ) ;
 
         status = TECConvertText(
                                 m_MB2WC_converter, (ConstTextPtr) psz, byteInLen, &byteInLen,
@@ -3019,16 +3021,16 @@ public :
         // we have to terminate here, because n might be larger for the trailing zero, and if UniChar
         // is not properly terminated we get random characters at the end
         dcubuf[byteOutLen / sizeof( UniChar ) ] = 0 ;
-        
+
         // now from the decomposed UniChar to properly composed uniChar
-        ConvertFromUnicodeToText( m_uniBack , byteOutLen , dcubuf , 
+        ConvertFromUnicodeToText( m_uniBack , byteOutLen , dcubuf ,
                                   kUnicodeDefaultDirectionMask, 0, NULL, NULL, NULL, dcubuflen  , &dcubufread , &dcubufwritten , ubuf ) ;
 
         free( dcubuf );
         byteOutLen = dcubufwritten ;
         ubuf[byteOutLen / sizeof( UniChar ) ] = 0 ;
-        
-        
+
+
 #if SIZEOF_WCHAR_T == 4
         wxMBConvUTF16 converter ;
         res = converter.MB2WC( (buf ? buf : tbuf), (const char*)ubuf, n ) ;
@@ -3036,13 +3038,13 @@ public :
 #else
         res = byteOutLen / sizeof( UniChar ) ;
 #endif
-        
+
         if ( buf == NULL )
             free(tbuf) ;
-        
+
         if ( buf  && res < n)
             buf[res] = 0;
-        
+
         return res ;
     }
 
@@ -3056,16 +3058,16 @@ public :
             m_map.otherEncoding = CreateTextEncoding(kTextEncodingUnicodeDefault,
                 kUnicodeCanonicalDecompVariant, kTextEncodingDefaultFormat);
             m_map.mappingVersion = kUnicodeUseLatestMapping;
-            
-            OSStatus err = CreateUnicodeToTextInfo(&m_map, &m_uni); 
+
+            OSStatus err = CreateUnicodeToTextInfo(&m_map, &m_uni);
             wxASSERT_MSG( err == noErr , _(" Couldn't create the UnicodeConverter")) ;
-            
+
             m_map.unicodeEncoding = CreateTextEncoding(kTextEncodingUnicodeDefault,
                                                        kUnicodeNoSubset, kTextEncodingDefaultFormat);
             m_map.otherEncoding = CreateTextEncoding(kTextEncodingUnicodeDefault,
                                                      kUnicodeCanonicalCompVariant, kTextEncodingDefaultFormat);
             m_map.mappingVersion = kUnicodeUseLatestMapping;
-            err = CreateUnicodeToTextInfo(&m_map, &m_uniBack); 
+            err = CreateUnicodeToTextInfo(&m_map, &m_uniBack);
             wxASSERT_MSG( err == noErr , _(" Couldn't create the UnicodeConverter")) ;
         }
     }
@@ -3073,7 +3075,7 @@ protected :
     mutable UnicodeToTextInfo   m_uni;
     mutable UnicodeToTextInfo   m_uniBack;
     mutable UnicodeMapping      m_map;
-}; 
+};
 #endif // defined(__WXMAC__) && defined(TARGET_CARBON)
 
 // ============================================================================
@@ -3340,7 +3342,7 @@ wxMBConv *wxCSConv::DoCreate() const
 
             const wxChar** names = wxFontMapperBase::GetAllEncodingNames(encoding);
             // CS : in case this does not return valid names (eg for MacRoman) encoding
-            // got a 'failure' entry in the cache all the same, although it just has to 
+            // got a 'failure' entry in the cache all the same, although it just has to
             // be created using a different method, so only store failed iconv creation
             // attempts (or perhaps we shoulnd't do this at all ?)
             if ( names[0] != NULL )

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 0f48a823003838f75564a8235757aa4b4ca1c2c5..7d404f3e72f5d1e2795624ef217ad112cc09f4a4 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/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
 //-----------------------------------------------------------------------------

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index f159065ef9cdace8d1a4a9079ec320d0a0b440ff..5264d092859a47727e98f7b4d5a75d91ccdd8fac 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/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
 

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 133b9f70b1b7a7bdf66766f8f0440d72455126fe..d6fc28e3902d0bfb4de93ad708b40f1cc9b48278 100644 (file)
--- a/src/msw/app.cpp
+++ b/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"

diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp
index 0a9a7154885dc4edcb19e3ac1ff3728fad2eced4..cf5c5f771ead41aeaf59e526760f63eb89f24483 100644 (file)
--- a/src/msw/checklst.cpp
+++ b/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"

diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp
index 21d50103f3922e0e9cea0096a881d77573640521..66a70b0eb50d13a9d172cfc3057c201580d47913 100644 (file)
--- a/src/msw/colordlg.cpp
+++ b/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>

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 6b3ec7f57fb63ccd237e604e387aee624ee458c8..937e23ea06051416239cbc8c6993faeddd79ed70 100644 (file)
--- a/src/msw/combobox.cpp
+++ b/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

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 73a8f2511aaba32dc3110d227b046830e96c3ae3..6572a219c03411fa3db236f43830b900a53a25ea 100644 (file)
--- a/src/msw/control.cpp
+++ b/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
 // ----------------------------------------------------------------------------

diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index 9619122ec0b77a5e25bc84cc2631de8bd94340b1..cdc7992e51cd0ac52a5143c88024f8293b436977 100644 (file)
--- a/src/msw/cursor.cpp
+++ b/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__

diff --git a/src/msw/datectrl.cpp b/src/msw/datectrl.cpp
index 2af227ee9d5a0055db24eb6ecc82603d42186224..ebe60e9318bfaba06347c32b13f23b0c834f96f7 100644 (file)
--- a/src/msw/datectrl.cpp
+++ b/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
 

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index 50e86d027cfad0cfc7c7d31b154c735e93c528e5..4f2367b42684a09876195cbe6d8e63599df5eca7 100644 (file)
--- a/src/msw/dc.cpp
+++ b/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

diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp
index 81687b72fe4d139b96567e3abce4c45e73d17b04..a2acc909cb6b94c60be2f84d3966991fa5215f99 100644 (file)
--- a/src/msw/dcprint.cpp
+++ b/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

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 8d30e360194f0bed928e400009fa3a5d705818eb..83260301ee9ed21edcf8b8a02371ab9e9c51d382 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/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__

diff --git a/src/msw/display.cpp b/src/msw/display.cpp
index 3a0844c3cec678ba3fa7bb6b630d249d2c78c479..0195c675ffc8cc1ebd0c44f51f0efa01a1d36a7d 100644 (file)
--- a/src/msw/display.cpp
+++ b/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;

diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp
index 06675c2b0f9fde7d572328bbb63f8521fc82d0c1..469d3954b028dd0fa960d960e8a5d63bd6801f41 100644 (file)
--- a/src/msw/dragimag.cpp
+++ b/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) \

diff --git a/src/msw/fdrepdlg.cpp b/src/msw/fdrepdlg.cpp
index 86c8606c5606184f5cba593a6b0630367f620dfa..fbfd80833dc802ebab706be6992879a537d0db20 100644 (file)
--- a/src/msw/fdrepdlg.cpp
+++ b/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
-

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index 76c8f73ecccb68535dcc7e556ae8635c057525a3..7389400e3cb5d195004aff79ab26646ff15455bf 100644 (file)
--- a/src/msw/filedlg.cpp
+++ b/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
 // ----------------------------------------------------------------------------

diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp
index 72802a232f255f8cdc2e35a3f2feaf5ce00bd96b..51a5bd1b2b47fbb0bb9c409176424a75d8841191 100644 (file)
--- a/src/msw/fontdlg.cpp
+++ b/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>
 

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 800cd97d862c93fdfd0097c589608b6fdf389e47..c31faeb7089bb06057c902641b045cdf5c9f6b21 100644 (file)
--- a/src/msw/frame.cpp
+++ b/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>

diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp
index d3e137616b5319cd9061b563fc0dfe3318a1922f..4d79cb7867588b04da94e2cfac681db7e48a0043 100644 (file)
--- a/src/msw/gauge95.cpp
+++ b/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
 // ----------------------------------------------------------------------------

diff --git a/src/msw/imaglist.cpp b/src/msw/imaglist.cpp
index d9ffadf717c40af7e26d83acb561178d6deba7d0..2b3cfb5c583d0a6462a34d94c11c5064ffd60f40 100644 (file)
--- a/src/msw/imaglist.cpp
+++ b/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
 // ----------------------------------------------------------------------------

diff --git a/src/msw/iniconf.cpp b/src/msw/iniconf.cpp
index 6c0617bb2f47651ab6725a6ea5c913f5f5bfa403..cce629bbc2d8c50f3ed64f7ebc6c577129d15e52 100644 (file)
--- a/src/msw/iniconf.cpp
+++ b/src/msw/iniconf.cpp
@@ -21,13 +21,14 @@
 #if wxUSE_CONFIG && !wxUSE_UNICODE
 
 #ifndef   WX_PRECOMP
-    #include  "wx/dynarray.h"
-    #include  "wx/string.h"
-    #include  "wx/intl.h"
-    #include  "wx/event.h"
-    #include  "wx/app.h"
-    #include  "wx/utils.h"
-    #include  "wx/log.h"
+    #include "wx/msw/wrapwin.h"
+    #include "wx/dynarray.h"
+    #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/event.h"
+    #include "wx/app.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
 // ----------------------------------------------------------------------------

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index 6bb6ef15278ea985e5dbfe99e72afd4288bd54e9..c70de886463e5bfe0d8fe66f32c94f2a4b6b280c 100644 (file)
--- a/src/msw/listctrl.cpp
+++ b/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.
 //

diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index 03c844447cef3c5b371f21f1c9f74f324be238ff..28581bd470261c959f2bfdcc5b5380551852a74c 100644 (file)
--- a/src/msw/menu.cpp
+++ b/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>

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index a7fcdfa20261e770a221b02a2c705c6563b3bd76..4ba885a2665ace81c60b777d9bd9227166ac6f40 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/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/dc.h"
-    #include  "wx/log.h"
-    #include  "wx/event.h"
-    #include  "wx/app.h"
-    #include  "wx/dcclient.h"
-    #include  "wx/dcmemory.h"
-    #include  "wx/control.h"
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
+    #include "wx/string.h"
+    #include "wx/dc.h"
+    #include "wx/log.h"
+    #include "wx/event.h"
+    #include "wx/app.h"
+    #include "wx/dcclient.h"
+    #include "wx/dcmemory.h"
+    #include "wx/control.h"
 #endif  // WX_PRECOMP
 
-#include  "wx/imaglist.h"
-#include  "wx/sysopt.h"
+#include "wx/imaglist.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

diff --git a/src/msw/ole/access.cpp b/src/msw/ole/access.cpp
index e168dda881f0348644285ab9434b5eb92a9c6b7e..15db11c56fb7f66b04cc4bb699a00d8eb9550fb9 100644 (file)
--- a/src/msw/ole/access.cpp
+++ b/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>

diff --git a/src/msw/ole/droptgt.cpp b/src/msw/ole/droptgt.cpp
index 1301f08d470de21a3f8e93aa71741745ffc1fba6..84d718ff17aada2cbd0eb55c2b953b2b3de09bba 100644 (file)
--- a/src/msw/ole/droptgt.cpp
+++ b/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

diff --git a/src/msw/ole/uuid.cpp b/src/msw/ole/uuid.cpp
index 06cd373fddf0c69a517bf1646eb37b1bcec498c1..0b1020d84915dce7dda313f782864eae297d38b5 100644 (file)
--- a/src/msw/ole/uuid.cpp
+++ b/src/msw/ole/uuid.cpp
@@ -22,10 +22,10 @@
 
 #if wxUSE_OLE && ( wxUSE_DRAG_AND_DROP || (defined(__WXDEBUG__) && wxUSE_DATAOBJ) )
 
-// standard headers
-#if wxCHECK_W32API_VERSION( 1, 0 )
+#ifndef WX_PRECOMP
     #include "wx/msw/wrapwin.h"
 #endif
+
 #include  <rpc.h>                       // UUID related functions
 
 #include  "wx/msw/ole/uuid.h"

diff --git a/src/msw/printdlg.cpp b/src/msw/printdlg.cpp
index 965fa3042e4daa9c29c30674584d27949de6032d..4fb94bd7993a25bde9e2b33129283e18ab98d696 100644 (file)
--- a/src/msw/printdlg.cpp
+++ b/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

diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp
index 3721f3ee5a149597ab08fe791b82719888469e63..6856dd94620f9272bdb268f3cbe26b131f956c9a 100644 (file)
--- a/src/msw/printwin.cpp
+++ b/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

diff --git a/src/msw/registry.cpp b/src/msw/registry.cpp
index f35ecd279c0961e1274342e1e5f996b9daa5fab9..59bdc789bf3feb52f4b2ef7a40cf66290b16a5d3 100644 (file)
--- a/src/msw/registry.cpp
+++ b/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/log.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
 #endif
 
-#include  "wx/file.h"
-#include  "wx/wfstream.h"
+#include "wx/file.h"
+#include "wx/wfstream.h"
 
 // Windows headers
-#include  "wx/msw/wrapwin.h"
-
 #ifdef __WXWINCE__
 #include "wx/msw/private.h"
 #include <winbase.h>

diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp
index 9817d4d7c1e96b813ad0ce9c179ed4b28939535b..e482e95ff1b877a19cc7ded9fac2be4edf69f922 100644 (file)
--- a/src/msw/settings.cpp
+++ b/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
 // ----------------------------------------------------------------------------

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index 480e82b6005c5f9e3b344aea8d38fa985727e476..ef1893737420cb934f1fb823e2c40aa754117386 100644 (file)
--- a/src/msw/slider95.cpp
+++ b/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
 // ----------------------------------------------------------------------------

diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp
index 43141278d6fbfd16cd23a0426d31ef57a9a094db..d4e20e76a544cf62dc4755bccb4bedc1c0a12bb2 100644 (file)
--- a/src/msw/spinbutt.cpp
+++ b/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)

diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp
index 16c1f39b1e1a017529f944eba7e14b4ab42ff41b..58673b0e3b38931d4213247b5da8eb40f459a7b2 100644 (file)
--- a/src/msw/spinctrl.cpp
+++ b/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"

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index b426f923e4cbdad63e91e95d9ac804651fa4ac43..66403b47bd146f1f27911ea06745d0f35f2b4701 100644 (file)
--- a/src/msw/statbox.cpp
+++ b/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

diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp
index 3c774a2457f182d7ad622651e543ee3c191fc6dc..c17ff4cc5744291e70b89437143cf806a3e147c7 100644 (file)
--- a/src/msw/statbr95.cpp
+++ b/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

diff --git a/src/msw/statline.cpp b/src/msw/statline.cpp
index 521b9e04caee35a8e0f17de194b365debb0a9802..4c902f5398b0f87def7e428f230342074fbe2688 100644 (file)
--- a/src/msw/statline.cpp
+++ b/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"
-#include "wx/msw/missing.h"
+#ifndef WX_PRECOMP
+    #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
-

diff --git a/src/msw/tabctrl.cpp b/src/msw/tabctrl.cpp
index a218e6d92300636c4e610e3d50a8a9f97cac4792..21eb96131ece31557585261e9858108e1fda0545 100644 (file)
--- a/src/msw/tabctrl.cpp
+++ b/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"
 

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 8dff81d4f95b4f734da059000ae6b050320e5ff7..1e93c69901aca152cff3936f935ceb0823509920 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/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

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index c331c3c95fe6fdcb900f1bf6d8237d43f8e10a1d..2b41db85905ac747c9ff53e01007c6296d6abd07 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/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
 
 // ----------------------------------------------------------------------------

diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp
index 462c74137b8c5847780593fc7690118f4e71b0c8..b48ed592cdcd16c9e51853f4b5b3ae965d68961a 100644 (file)
--- a/src/msw/thread.cpp
+++ b/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"

diff --git a/src/msw/tooltip.cpp b/src/msw/tooltip.cpp
index b18f806040035441e4d4900e1708ce08504be5e6..aa5388cf2da747a05e06461d45e62bbf5c5c2d87 100644 (file)
--- a/src/msw/tooltip.cpp
+++ b/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.
@@ -347,7 +345,7 @@ void wxToolTip::Add(WXHWND hWnd)
                     }
                     if ( sz.cx > max )
                         max = sz.cx;
-                    
+
                     token = tokenizer.GetNextToken();
                 }
 

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index b2af8b24839930d29c9b5df8de32ac4dae1c20af..97fec59a6a216a314abd1029e0696ce7a56d3382 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/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"

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index cafa1850313dc93248e17ac78f745c872bdd4e05..8a7ce1352577325c7e7165d7d094980877b2c32c 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/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

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 1659a50bc7b22847bfa261112dfe27da573684e7..6eff2fe2536ba5dd69c0e892bed5b628376b47c5 100644 (file)
--- a/src/msw/utils.cpp
+++ b/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

diff --git a/src/msw/volume.cpp b/src/msw/volume.cpp
index 1331da183dd03691ad83f1db1df2c02093754500..3a1fa48ec11c9c172ddb824261e33d47a09ae7ac 100644 (file)
--- a/src/msw/volume.cpp
+++ b/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
 

diff --git a/src/msw/wince/checklst.cpp b/src/msw/wince/checklst.cpp
index d2ce744d1f22c658a70ea89b5479dfbbce36223c..24215c91f30712bd5437a5ae237e747016beb722 100644 (file)
--- a/src/msw/wince/checklst.cpp
+++ b/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
 // ============================================================================

diff --git a/src/msw/wince/choicece.cpp b/src/msw/wince/choicece.cpp
index caef2a0388fe1e5f8209192a34b0100324ea9a5b..5540dcca03f571e1f4a21ad078d7533ccc646a24 100644 (file)
--- a/src/msw/wince/choicece.cpp
+++ b/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

diff --git a/src/msw/wince/helpwce.cpp b/src/msw/wince/helpwce.cpp
index 28958bff85505f9fdd4b9f24edb01f1410727b79..10aed8a102d07d87d5528494971b17a4b6dc66b4 100644 (file)
--- a/src/msw/wince/helpwce.cpp
+++ b/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
-

diff --git a/src/msw/wince/net.cpp b/src/msw/wince/net.cpp
index 28545a28c49817d7dc15aed86b369b8f6deab81b..2c05380bb6dcf4fc22539f0c9a0c6a69200cd5fc 100644 (file)
--- a/src/msw/wince/net.cpp
+++ b/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;
 }
-

diff --git a/src/msw/wince/tbarwce.cpp b/src/msw/wince/tbarwce.cpp
index f80b550c3a74caf58249cc80bc06e8e8c1443ddd..27a5d7b31364bfe77d2aa2d95fdd1aac2a161d2d 100644 (file)
--- a/src/msw/wince/tbarwce.cpp
+++ b/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>

diff --git a/src/msw/wince/textctrlce.cpp b/src/msw/wince/textctrlce.cpp
index b7e5715c8cebd3211d4d0b28c80d0f22a0ce2dab..abea606670a97b28c7d2ab81797924451aa1f008 100644 (file)
--- a/src/msw/wince/textctrlce.cpp
+++ b/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"
 

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index b68d59085d548d81ee6710ac0eaa67db8c3155f8..bd227b7ed35ab07fe7f42e7a1a19512c9a2903d6 100644 (file)
--- a/src/msw/window.cpp
+++ b/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__