#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
// ----------------------------------------------------------------------------
// 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
virtual ~wxComboCtrl();
- virtual void DrawFocusBackground( wxDC& dc, const wxRect& rect, int flags ) const;
+ virtual void PrepareBackground( wxDC& dc, const wxRect& rect, int flags ) const;
+ virtual bool IsKeyPopupToggle(const wxKeyEvent& event) const;
static int GetFeatures() { return wxComboCtrlFeatures::All; }
+#if wxUSE_COMBOCTRL_POPUP_ANIMATION
+ void OnTimerEvent(wxTimerEvent& WXUNUSED(event)) { DoTimerEvent(); }
+
+protected:
+ void DoTimerEvent();
+
+ virtual bool AnimateShow( const wxRect& rect, int flags );
+#endif // wxUSE_COMBOCTRL_POPUP_ANIMATION
+
protected:
// customization
virtual void OnResize();
virtual wxCoord GetNativeTextIndent() const;
- virtual void OnThemeChange();
// event handlers
void OnPaintEvent( wxPaintEvent& event );
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)