Include commctrl.h properly.

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

src/msw/combobox.cpp

@@ -40,10 +40,10 @@
 #include "wx/clipbrd.h"
 #include "wx/msw/private.h"
 
+// include <commctrl.h> "properly"
+#include "wx/msw/wrapcctl.h"
+
 #if wxUSE_TOOLTIPS
-    #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__)
-        #include <commctrl.h>
-    #endif
     #include "wx/tooltip.h"
 #endif // wxUSE_TOOLTIPS
 

src/msw/frame.cpp

@@ -40,9 +40,8 @@
 
 #include "wx/msw/private.h"
 
-#ifdef __WXWINCE__
+// include <commctrl.h> "properly"
-#include <commctrl.h>
+#include "wx/msw/wrapcctl.h"
-#endif
 
 #if defined(__POCKETPC__) || defined(__SMARTPHONE__)
     #include <ole2.h>

src/msw/gauge95.cpp

@@ -32,9 +32,8 @@
 #include "wx/gauge.h"
 #include "wx/msw/private.h"
 
-#if !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
+// include <commctrl.h> "properly"
-    #include <commctrl.h>
+#include "wx/msw/wrapcctl.h"
-#endif
 
 // ----------------------------------------------------------------------------
 // constants

src/msw/menu.cpp

@@ -41,13 +41,15 @@
 
 #include "wx/msw/private.h"
 
+// include <commctrl.h> "properly"
+#include "wx/msw/wrapcctl.h"
+
 #ifdef __WXWINCE__
 #include <windows.h>
 #include <windowsx.h>
 #include <tchar.h>
 #include <ole2.h>
 #include <shellapi.h>
-#include <commctrl.h>
 #if (_WIN32_WCE < 400) && !defined(__HANDHELDPC__)
 #include <aygshell.h>
 #endif

src/msw/notebook.cpp

@@ -37,11 +37,11 @@
 #include  "wx/msw/private.h"
 
 #include  <windowsx.h>
-
-#include <commctrl.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/slider95.cpp

@@ -34,9 +34,8 @@
 #include "wx/slider.h"
 #include "wx/msw/subwin.h"
 
-#if !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
+// include <commctrl.h> "properly"
-    #include <commctrl.h>
+#include "wx/msw/wrapcctl.h"
-#endif
 
 // ----------------------------------------------------------------------------
 // constants

src/msw/wince/choicece.cpp

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

src/msw/wince/tbarwce.cpp

@@ -45,13 +45,15 @@
     #include "malloc.h"
 #endif
 
+// include <commctrl.h> "properly"
+#include "wx/msw/wrapcctl.h"
+
 #include "wx/msw/private.h"
 #include <windows.h>
 #include <windowsx.h>
 #include <tchar.h>
 #include <ole2.h>
 #include <shellapi.h>
-#include <commctrl.h>
 #if defined(WINCE_WITHOUT_COMMANDBAR)
   #include <aygshell.h>
 #endif

src/msw/wince/textctrlce.cpp

@@ -24,19 +24,19 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_TEXTCTRL && defined(__SMARTPHONE__) && defined(__WXWINCE__)
+
+#include "wx/textctrl.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/textctrl.h"
 #endif
 
+// include <commctrl.h> "properly"
+#include "wx/msw/wrapcctl.h"
+
 #include "wx/spinbutt.h"
 #include "wx/textfile.h"
 
-#include <commctrl.h>
-#include "wx/msw/missing.h"
-#include "wx/msw/winundef.h"
-
-#if wxUSE_TEXTCTRL && defined(__SMARTPHONE__) && defined(__WXWINCE__)
-
 #define GetBuddyHwnd()      (HWND)(m_hwndBuddy)
 
 #define IsVertical(wxStyle) (true)

src/msw/window.cpp

@@ -104,7 +104,8 @@
     #include <windowsx.h>
 #endif
 
-#include <commctrl.h>
+// include <commctrl.h> "properly"
+#include "wx/msw/wrapcctl.h"
 
 #ifndef __WXWINCE__
     #include <pbt.h>

src/palmos/combobox.cpp

@@ -40,9 +40,6 @@
 #include "wx/palmos/private.h"
 
 #if wxUSE_TOOLTIPS
-    #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__)
-        #include <commctrl.h>
-    #endif
     #include "wx/tooltip.h"
 #endif // wxUSE_TOOLTIPS