Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation fix after NULL cast removal; also used it to get rid of an ugly OnTimerEvent(*(wxTimerEvent *)NULL) call

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-01-19 14:40:13 +00:00
parent fa00c4e3ba
commit 952555f7b1
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/msw/combo.h
View File

@@ -73,10 +73,13 @@ public:
static int GetFeatures() { return wxComboCtrlFeatures::All; } static int GetFeatures() { return wxComboCtrlFeatures::All; }
#if wxUSE_COMBOCTRL_POPUP_ANIMATION #if wxUSE_COMBOCTRL_POPUP_ANIMATION
void OnTimerEvent( wxTimerEvent& event ); void OnTimerEvent(wxTimerEvent& WXUNUSED(event)) { DoTimerEvent(); }
protected: protected:
void DoTimerEvent();
virtual bool AnimateShow( const wxRect& rect, int flags ); virtual bool AnimateShow( const wxRect& rect, int flags );
#endif #endif // wxUSE_COMBOCTRL_POPUP_ANIMATION
protected: protected:

4
src/msw/combo.cpp
View File

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