Disconnect "hide" menu signal to fix menu destruction in wxGTK.

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

diff --git a/include/wx/msw/combo.h b/include/wx/msw/combo.h
index ce07dd572ae0bc77a1c04695e6e2040eedf606a9..be85dbcf41ea3e99074de92bf2a7cae2bf8d15cd 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,17 +73,19 @@ public:
     static int GetFeatures() { return wxComboCtrlFeatures::All; }
 
 #if wxUSE_COMBOCTRL_POPUP_ANIMATION
-    void OnTimerEvent( wxTimerEvent& event );
+    void OnTimerEvent(wxTimerEvent& WXUNUSED(event)) { DoTimerEvent(); }
+
 protected:
+    void DoTimerEvent();
+
     virtual bool AnimateShow( const wxRect& rect, int flags );
-#endif
+#endif // wxUSE_COMBOCTRL_POPUP_ANIMATION
 
 protected:
 
     // customization
     virtual void OnResize();
     virtual wxCoord GetNativeTextIndent() const;
-    virtual void OnThemeChange();
 
     // event handlers
     void OnPaintEvent( wxPaintEvent& event );