Back to unsigned int count in wxTreeCtrl.

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

diff --git a/include/wx/msw/wrapcctl.h b/include/wx/msw/wrapcctl.h
index fb26166ee09b0217dd0eb5445e50fb2242ed436a..0edf3d96ecdc20f75ba56bbf73f24609e45a6d68 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
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -34,14 +34,27 @@
     #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 <commctrl.h>
 
 // define things which might be missing from our commctrl.h
 #include "wx/msw/missing.h"
 
-#endif // _WX_MSW_WRAPCCTL_H_
+// Set Unicode format for a common control
+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
+#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_