cleaning up problems after string changes

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

diff --git a/include/wx/msw/wrapcctl.h b/include/wx/msw/wrapcctl.h
index 6c916ffa7f0c800718a389b25c6510d5607e7428..65c17f4d1c399b04131350f00cf6fe4bbf043d77 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$
 // 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
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -34,27 +34,29 @@
     #define _WIN32_IE 0x0600
 #endif // !defined(_WIN32_IE)
 
     #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
 
 // 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);
 {
 #ifndef __WXWINCE__
     ::SendMessage(hwnd, CCM_SETUNICODEFORMAT, wxUSE_UNICODE, 0);

-#endif // __WXWINCE__
+#else // !__WXWINCE__
+    // here it should be already in Unicode anyhow
+#endif // __WXWINCE__/!__WXWINCE__

 }
 
 }
 

+#if wxUSE_GUI

 // Return the default font for the common controls
 //
 // this is implemented in msw/settings.cpp
 // Return the default font for the common controls
 //
 // this is implemented in msw/settings.cpp

+class wxFont;

 extern wxFont wxGetCCDefaultFont();
 extern wxFont wxGetCCDefaultFont();

+#endif

 
 #endif // _WX_MSW_WRAPCCTL_H_
 
 #endif // _WX_MSW_WRAPCCTL_H_

-