compilation fix after NULL cast removal; also used it to get rid of an ugly OnTimerEv...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/combo.h b/include/wx/msw/combo.h
index cc9b35d53e5ac1c889de0554f2c3457b0129442f..78ef4f59eff6659312a2213c9e99865c11b89507 100644 (file)
--- a/include/wx/msw/combo.h
+++ b/include/wx/msw/combo.h
@@ -73,10 +73,13 @@ public:
     static int GetFeatures() { return wxComboCtrlFeatures::All; }
 
 #if wxUSE_COMBOCTRL_POPUP_ANIMATION
-    void OnTimerEvent( wxTimerEvent& event );
+    void OnTimerEvent(wxTimerEvent& WXUNUSED(event)) { DoTimerEvent(); }
+
 protected:
+    void DoTimerEvent();
+
     virtual bool AnimateShow( const wxRect& rect, int flags );
-#endif
+#endif // wxUSE_COMBOCTRL_POPUP_ANIMATION
 
 protected:
 

diff --git a/src/msw/combo.cpp b/src/msw/combo.cpp
index caf2fc428e5197f8d43418dceca7d549b8da186a..a37257ae652f5ee4de9498cd2035c9bfb01aace4 100644 (file)
--- a/src/msw/combo.cpp
+++ b/src/msw/combo.cpp
@@ -763,7 +763,7 @@ static wxUint32 GetUserPreferencesMask()
 #endif
 
 #if wxUSE_COMBOCTRL_POPUP_ANIMATION
-void wxComboCtrl::OnTimerEvent( wxTimerEvent& WXUNUSED(event) )
+void wxComboCtrl::DoTimerEvent()
 {
     bool stopTimer = false;
 
@@ -831,7 +831,7 @@ bool wxComboCtrl::AnimateShow( const wxRect& rect, int flags )
         m_animTimer.SetOwner( this, wxID_ANY );
         m_animTimer.Start( COMBOBOX_ANIMATION_RESOLUTION, wxTIMER_CONTINUOUS );
 
-        OnTimerEvent(*(NULL));  // Event is never used, so we can give NULL
+        DoTimerEvent();
 
         return false;
     }