X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/30be036c6d4990f8aa21af5b86abdc0852e686a0..ac10ea91c9bff4a8daae3313063867647c1e1079:/include/wx/msw/combo.h?ds=sidebyside diff --git a/include/wx/msw/combo.h b/include/wx/msw/combo.h index 4f350d8f30..cc9b35d53e 100644 --- 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,8 +73,9 @@ public: static int GetFeatures() { return wxComboCtrlFeatures::All; } #if wxUSE_COMBOCTRL_POPUP_ANIMATION - virtual bool AnimateShow( const wxRect& rect, int flags ); void OnTimerEvent( wxTimerEvent& event ); +protected: + virtual bool AnimateShow( const wxRect& rect, int flags ); #endif protected: