X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/30be036c6d4990f8aa21af5b86abdc0852e686a0..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/include/wx/msw/combo.h diff --git a/include/wx/msw/combo.h b/include/wx/msw/combo.h index 4f350d8f30..1f99eaa935 100644 --- a/include/wx/msw/combo.h +++ b/include/wx/msw/combo.h @@ -33,7 +33,7 @@ // 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 { @@ -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: