X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/553c5bcc3ab65e8b8a002dc6d5f51cba4f39292c..e12a951e754d0e6a67a211a1d8fb788e0a166094:/include/wx/msw/wrapcctl.h

diff --git a/include/wx/msw/wrapcctl.h b/include/wx/msw/wrapcctl.h
index 6c916ffa7f..3faa980790 100644
--- a/include/wx/msw/wrapcctl.h
+++ b/include/wx/msw/wrapcctl.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     03.08.2003
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -34,11 +34,7 @@
     #define _WIN32_IE 0x0600
 #endif // !defined(_WIN32_IE)
 
-#if defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)
-    #include "wx/msw/gnuwin32/extra.h"
-#else
-    #include <commctrl.h>
-#endif
+#include <commctrl.h>
 
 // define things which might be missing from our commctrl.h
 #include "wx/msw/missing.h"
@@ -48,7 +44,10 @@ inline void wxSetCCUnicodeFormat(HWND hwnd)
 {
 #ifndef __WXWINCE__
     ::SendMessage(hwnd, CCM_SETUNICODEFORMAT, wxUSE_UNICODE, 0);
-#endif // __WXWINCE__
+#else // !__WXWINCE__
+    // here it should be already in Unicode anyhow
+    wxUnusedVar(hwnd);
+#endif // __WXWINCE__/!__WXWINCE__
 }
 
 // Return the default font for the common controls