mirror of
https://github.com/cookiengineer/audacity
synced 2026-02-09 05:01:57 +01:00
wxMSW 2.8.11 doesn't allow multiple timers to have the same ID, so use wxID_ANY
for timers
This commit is contained in:
@@ -89,7 +89,6 @@ const wxRect kDummyRect = wxRect(-9999, -9999, 0, 0);
|
||||
|
||||
enum {
|
||||
kToggleButtonID = 5000,
|
||||
kTimerID
|
||||
};
|
||||
|
||||
WX_DEFINE_OBJARRAY(wxArrayRect);
|
||||
@@ -108,7 +107,7 @@ public:
|
||||
|
||||
BEGIN_EVENT_TABLE(ExpandingToolBar, wxPanel)
|
||||
EVT_SIZE(ExpandingToolBar::OnSize)
|
||||
EVT_TIMER(kTimerID, ExpandingToolBar::OnTimer)
|
||||
EVT_TIMER(wxID_ANY, ExpandingToolBar::OnTimer)
|
||||
EVT_BUTTON(kToggleButtonID, ExpandingToolBar::OnToggle)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
@@ -165,7 +164,7 @@ ExpandingToolBar::ExpandingToolBar(wxWindow* parent,
|
||||
mToggleButton->UseDisabledAsDownHiliteImage(true);
|
||||
|
||||
SetAutoLayout(true);
|
||||
mTimer.SetOwner(this, kTimerID);
|
||||
mTimer.SetOwner(this, wxID_ANY);
|
||||
}
|
||||
|
||||
ExpandingToolBar::~ExpandingToolBar()
|
||||
|
||||
Reference in New Issue
Block a user