applied patch #931719: "ESC closes dialog instead of combobox dropdown" (closes patch...

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

diff --git a/include/wx/msw/wrapcctl.h b/include/wx/msw/wrapcctl.h
index c8d13f8378555dffbd917686a7698c65aa92bcb2..2e508081c4655abf50fd6bfa283f615d0972f231 100644 (file)
--- a/include/wx/msw/wrapcctl.h
+++ b/include/wx/msw/wrapcctl.h
@@ -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_