work around (harmless) warnings in VC7 release build

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

diff --git a/include/wx/msw/combo.h b/include/wx/msw/combo.h
index 4f350d8f30df3ba87bb06c69017d6158e1f9dec1..78ef4f59eff6659312a2213c9e99865c11b89507 100644 (file)
--- a/include/wx/msw/combo.h
+++ b/include/wx/msw/combo.h
@@ -33,9 +33,9 @@
 // Define this only if native implementation includes all features
 #define wxCOMBOCONTROL_FULLY_FEATURED
 
-extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxComboBoxNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[];
 
-class WXDLLEXPORT wxComboCtrl : public wxComboCtrlBase
+class WXDLLIMPEXP_CORE wxComboCtrl : public wxComboCtrlBase
 {
 public:
     // ctors and such
@@ -73,9 +73,13 @@ public:
     static int GetFeatures() { return wxComboCtrlFeatures::All; }
 
 #if wxUSE_COMBOCTRL_POPUP_ANIMATION
+    void OnTimerEvent(wxTimerEvent& WXUNUSED(event)) { DoTimerEvent(); }
+
+protected:
+    void DoTimerEvent();
+
     virtual bool AnimateShow( const wxRect& rect, int flags );
-    void OnTimerEvent( wxTimerEvent& event );
-#endif
+#endif // wxUSE_COMBOCTRL_POPUP_ANIMATION
 
 protected: