X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a340b80d8a692f5308d26c1c1b95fd689a1d7eb3..e6a8416274252fb6ea33800cfce0e4ba0a0542f1:/include/wx/msw/combo.h diff --git a/include/wx/msw/combo.h b/include/wx/msw/combo.h index a62255e133..ce07dd572a 100644 --- a/include/wx/msw/combo.h +++ b/include/wx/msw/combo.h @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/msw/combo.h -// Purpose: wxComboControl class +// Purpose: wxComboCtrl class // Author: Jaakko Salli // Modified by: // Created: Apr-30-2006 @@ -13,25 +13,35 @@ #define _WX_COMBOCONTROL_H_ // NB: Definition of _WX_COMBOCONTROL_H_ is used in wx/generic/combo.h to -// determine whether there is native wxComboControl, so make sure you -// use it in all native wxComboControls. +// determine whether there is native wxComboCtrl, so make sure you +// use it in all native wxComboCtrls. + +#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 -#if wxUSE_COMBOCONTROL // ---------------------------------------------------------------------------- -// Native wxComboControl +// Native wxComboCtrl // ---------------------------------------------------------------------------- // Define this only if native implementation includes all features #define wxCOMBOCONTROL_FULLY_FEATURED -class WXDLLEXPORT wxComboControl : public wxComboControlBase +extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxComboBoxNameStr[]; + +class WXDLLEXPORT wxComboCtrl : public wxComboCtrlBase { public: // ctors and such - wxComboControl() : wxComboControlBase() { Init(); } + wxComboCtrl() : wxComboCtrlBase() { Init(); } - wxComboControl(wxWindow *parent, + wxComboCtrl(wxWindow *parent, wxWindowID id = wxID_ANY, const wxString& value = wxEmptyString, const wxPoint& pos = wxDefaultPosition, @@ -39,7 +49,7 @@ public: long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxComboBoxNameStr) - : wxComboControlBase() + : wxComboCtrlBase() { Init(); @@ -55,11 +65,18 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxComboBoxNameStr); - virtual ~wxComboControl(); + virtual ~wxComboCtrl(); - virtual void DrawFocusBackground( wxDC& dc, const wxRect& rect, int flags ); + virtual void PrepareBackground( wxDC& dc, const wxRect& rect, int flags ) const; + virtual bool IsKeyPopupToggle(const wxKeyEvent& event) const; - static int GetFeatures() { return wxComboControlFeatures::All; } + 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: @@ -75,12 +92,20 @@ 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(wxComboControl) + DECLARE_DYNAMIC_CLASS(wxComboCtrl) }; -#endif // wxUSE_COMBOCONTROL +#endif // wxUSE_COMBOCTRL #endif // _WX_COMBOCONTROL_H_