move WX_GL_XXX constants from wx/*/glcanvas.h to wx/glcanvas.h (this makes them avail...

[wxWidgets.git] / include / wx / msw / wrapcctl.h

diff --git a/include/wx/msw/wrapcctl.h b/include/wx/msw/wrapcctl.h
index faf3c8ebabef3b905a01c815cb71ec2ec2b8fb78..65c17f4d1c399b04131350f00cf6fe4bbf043d77 100644 (file)
--- a/include/wx/msw/wrapcctl.h
+++ b/include/wx/msw/wrapcctl.h
@@ -6,7 +6,7 @@
 // Created:     03.08.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _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_
-