X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..b052a864e9d5270fd40f9ee6021133d2c3cd3173:/include/wx/msw/wrapcctl.h

diff --git a/include/wx/msw/wrapcctl.h b/include/wx/msw/wrapcctl.h
index bc8ce1d9af..65c17f4d1c 100644
--- a/include/wx/msw/wrapcctl.h
+++ b/include/wx/msw/wrapcctl.h
@@ -34,30 +34,29 @@
     #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 "wx/msw/wrapwin.h"
+
+#include <commctrl.h>
 
 // define things which might be missing from our commctrl.h
 #include "wx/msw/missing.h"
 
 // Set Unicode format for a common control
-inline void wxSetCCUnicodeFormat(HWND hwnd)
+inline void wxSetCCUnicodeFormat(HWND WXUNUSED_IN_WINCE(hwnd))
 {
 #ifndef __WXWINCE__
     ::SendMessage(hwnd, CCM_SETUNICODEFORMAT, wxUSE_UNICODE, 0);
 #else // !__WXWINCE__
     // here it should be already in Unicode anyhow
-    wxUnusedVar(hwnd);
 #endif // __WXWINCE__/!__WXWINCE__
 }
 
+#if wxUSE_GUI
 // Return the default font for the common controls
 //
 // this is implemented in msw/settings.cpp
+class wxFont;
 extern wxFont wxGetCCDefaultFont();
+#endif
 
 #endif // _WX_MSW_WRAPCCTL_H_
-