More broken compilers with enum/wxString& ambiguity.

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

diff --git a/include/wx/msw/wrapcctl.h b/include/wx/msw/wrapcctl.h
index c8d13f8378555dffbd917686a7698c65aa92bcb2..bc8ce1d9afe85aedd16afc66df219a34727888e5 100644 (file)
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -47,16 +47,17 @@
 inline void wxSetCCUnicodeFormat(HWND hwnd)
 {
 #ifndef __WXWINCE__
-    SendMessage(hwnd, CCM_SETUNICODEFORMAT,
-#if wxUSE_UNICODE
-                TRUE
-#else
-                FALSE
-#endif
-                , 0);
-#endif
-  // __WXWINCE__
+    ::SendMessage(hwnd, CCM_SETUNICODEFORMAT, wxUSE_UNICODE, 0);
+#else // !__WXWINCE__
+    // here it should be already in Unicode anyhow
+    wxUnusedVar(hwnd);
+#endif // __WXWINCE__/!__WXWINCE__
 }
 
+// Return the default font for the common controls
+//
+// this is implemented in msw/settings.cpp
+extern wxFont wxGetCCDefaultFont();
+
 #endif // _WX_MSW_WRAPCCTL_H_