X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fba05595e6cca40763f8ead119c7ad61cb01e0e4..f8a7dd5f4162313d76ae2e2df46740f3a9e49071:/include/wx/msw/combo.h diff --git a/include/wx/msw/combo.h b/include/wx/msw/combo.h index 1f99eaa935..be85dbcf41 100644 --- a/include/wx/msw/combo.h +++ b/include/wx/msw/combo.h @@ -35,7 +35,7 @@ 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 );