X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/118f5fbd0651e6c610a44a42a41dcf93439e820d..42124e683da03a7a7463ad9e37d15fda575348af:/include/wx/msw/combo.h diff --git a/include/wx/msw/combo.h b/include/wx/msw/combo.h index 1147db76e9..cc9b35d53e 100644 --- a/include/wx/msw/combo.h +++ b/include/wx/msw/combo.h @@ -18,6 +18,14 @@ #if wxUSE_COMBOCTRL +#if !defined(__WXWINCE__) && wxUSE_TIMER + #include "wx/timer.h" + #define wxUSE_COMBOCTRL_POPUP_ANIMATION 1 +#else + #define wxUSE_COMBOCTRL_POPUP_ANIMATION 0 +#endif + + // ---------------------------------------------------------------------------- // Native wxComboCtrl // ---------------------------------------------------------------------------- @@ -25,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 @@ -64,6 +72,12 @@ public: static int GetFeatures() { return wxComboCtrlFeatures::All; } +#if wxUSE_COMBOCTRL_POPUP_ANIMATION + void OnTimerEvent( wxTimerEvent& event ); +protected: + virtual bool AnimateShow( const wxRect& rect, int flags ); +#endif + protected: // customization @@ -78,6 +92,14 @@ protected: private: void Init(); +#if wxUSE_COMBOCTRL_POPUP_ANIMATION + // Popup animation related + wxLongLong m_animStart; + wxTimer m_animTimer; + wxRect m_animRect; + int m_animFlags; +#endif + DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxComboCtrl)