multiple fixes to wxJoystick under Unix and new index-based API for accessing joystic...

[wxWidgets.git] / include / wx / msw / combo.h

diff --git a/include/wx/msw/combo.h b/include/wx/msw/combo.h
index 95f836bb91ac10beee344767b7eadfc393f6e709..ce07dd572ae0bc77a1c04695e6e2040eedf606a9 100644 (file)
--- a/include/wx/msw/combo.h
+++ b/include/wx/msw/combo.h
@@ -18,6 +18,14 @@
 
 #if wxUSE_COMBOCTRL
 
 
 #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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Native wxComboCtrl
 // ----------------------------------------------------------------------------


@@ -25,6 +33,8 @@
 // Define this only if native implementation includes all features
 #define wxCOMBOCONTROL_FULLY_FEATURED
 
 // Define this only if native implementation includes all features
 #define wxCOMBOCONTROL_FULLY_FEATURED
 

+extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxComboBoxNameStr[];
+

 class WXDLLEXPORT wxComboCtrl : public wxComboCtrlBase
 {
 public:
 class WXDLLEXPORT wxComboCtrl : public wxComboCtrlBase
 {
 public:


@@ -57,10 +67,17 @@ public:
 
     virtual ~wxComboCtrl();
 
 
     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 wxComboCtrlFeatures::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:
 
     // customization
 protected:
 
     // customization


@@ -75,6 +92,14 @@ protected:
 private:
     void Init();
 
 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)
     DECLARE_EVENT_TABLE()
 
     DECLARE_DYNAMIC_CLASS(wxComboCtrl)