Include commctrl.h properly.

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

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 2648bd802455fccd4cdc86455c78684e06acfcad..41b73b447894ab39d9ed317dbd9c2d72aa572da1 100644 (file)
--- a/src/msw/combobox.cpp
+++ b/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
 

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 41518eac1836baca1e467b7f33e3f0a49c175ec1..f438b28bb7d51f767760ae78d4d5bf2b1c045267 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -40,9 +40,8 @@
 
 #include "wx/msw/private.h"
 
-#ifdef __WXWINCE__
-#include <commctrl.h>
-#endif
+// include <commctrl.h> "properly"
+#include "wx/msw/wrapcctl.h"
 
 #if defined(__POCKETPC__) || defined(__SMARTPHONE__)
     #include <ole2.h>

diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp
index 655e9fcf672bb05dbe6da9fac39483a8296e01d5..20ca1b55f55d85408a7ca45a4a064efef2aadfa9 100644 (file)
--- a/src/msw/gauge95.cpp
+++ b/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>
-#endif
+// include <commctrl.h> "properly"
+#include "wx/msw/wrapcctl.h"
 
 // ----------------------------------------------------------------------------
 // constants

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

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index 63d07543f3ab8582abbbc848917fba6e0ea0c0ef..193bd61d6c8ae47ef199cd4602afeba72dff7b19 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/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

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index 193017c84ab3678af047944e2fd083aca2703b74..6b7d26723bb45150045e9f1ef4944cfe365d9a82 100644 (file)
--- a/src/msw/slider95.cpp
+++ b/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>
-#endif
+// include <commctrl.h> "properly"
+#include "wx/msw/wrapcctl.h"
 
 // ----------------------------------------------------------------------------
 // constants

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

diff --git a/src/msw/wince/tbarwce.cpp b/src/msw/wince/tbarwce.cpp
index 5919c6a704ab87b28222794f35ec35daf402cc1e..173dbd249ee2f1fbbbd43f25014e82c9b46cc7ee 100644 (file)
--- a/src/msw/wince/tbarwce.cpp
+++ b/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

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 7691c62d9abd6dbd6a778181b28f0b39f198cf90..8934f9ac74f3a0241c744503b59e418138036f08 100644 (file)
--- a/src/msw/window.cpp
+++ b/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>

diff --git a/src/palmos/combobox.cpp b/src/palmos/combobox.cpp
index 9ede2abaf1ea3ac5c7366431a982f6488aed285e..e35fbcf02807bab6c2dd4079d84aed80d3b68fcf 100644 (file)
--- a/src/palmos/combobox.cpp
+++ b/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