Move "static" keyword out from wxDEPRECATED() macros to placate icc.

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

diff --git a/include/wx/msw/wrapcctl.h b/include/wx/msw/wrapcctl.h
index 8d4cd2c70e1e6b8e8cea9f7a66adb29eb9f51808..f06b308e0880c3eac1125be550b9ce61779acccb 100644 (file)
--- a/include/wx/msw/wrapcctl.h
+++ b/include/wx/msw/wrapcctl.h
@@ -35,6 +35,17 @@ inline void wxSetCCUnicodeFormat(HWND WXUNUSED_IN_WINCE(hwnd))
 // this is implemented in msw/settings.cpp
 class wxFont;
 extern wxFont wxGetCCDefaultFont();
 // this is implemented in msw/settings.cpp
 class wxFont;
 extern wxFont wxGetCCDefaultFont();

-#endif
+
+// this is just a wrapper for HDITEM which we can't use in the public header
+// because we don't want to include commctrl.h (and hence windows.h) from there
+struct wxHDITEM : public HDITEM
+{
+    wxHDITEM()
+    {
+        ::ZeroMemory(this, sizeof(*this));
+    }
+};
+
+#endif // wxUSE_GUI

 
 #endif // _WX_MSW_WRAPCCTL_H_
 
 #endif // _WX_MSW_WRAPCCTL_H_