X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a63feff3a93d9d9dc36f155d3a5c3a36cb922f0..9ed8b5a7b2e41ecb07d2dab32bac32eb7b771fd3:/include/wx/msw/wrapcctl.h

diff --git a/include/wx/msw/wrapcctl.h b/include/wx/msw/wrapcctl.h
index 188377baca..65c17f4d1c 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,26 +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))
 {
-    SendMessage(hwnd, CCM_SETUNICODEFORMAT,
-#if wxUSE_UNICODE
-                TRUE
-#else
-                FALSE
-#endif
-                , 0);
+#ifndef __WXWINCE__
+    ::SendMessage(hwnd, CCM_SETUNICODEFORMAT, wxUSE_UNICODE, 0);
+#else // !__WXWINCE__
+    // here it should be already in Unicode anyhow
+#endif // __WXWINCE__/!__WXWINCE__
 }
 
-#endif // _WX_MSW_WRAPCCTL_H_
+#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_