projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simplified gradient code a bit
[wxWidgets.git]
/
include
/
wx
/
msw
/
combo.h
diff --git
a/include/wx/msw/combo.h
b/include/wx/msw/combo.h
index 1147db76e93f06478331d14f7f6170ef24a5c4fc..4f350d8f30df3ba87bb06c69017d6158e1f9dec1 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
// ----------------------------------------------------------------------------
@@
-64,6
+72,11
@@
public:
static int GetFeatures() { return wxComboCtrlFeatures::All; }
static int GetFeatures() { return wxComboCtrlFeatures::All; }
+#if wxUSE_COMBOCTRL_POPUP_ANIMATION
+ virtual bool AnimateShow( const wxRect& rect, int flags );
+ void OnTimerEvent( wxTimerEvent& event );
+#endif
+
protected:
// customization
protected:
// customization
@@
-78,6
+91,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)