1
0
mirror of https://github.com/cookiengineer/audacity synced 2026-02-09 13:12:17 +01:00

Revert r10217 (wxWidgets applied my fix to the timer ID issue)

This commit is contained in:
BusinessmanProgrammerSteve
2010-02-08 21:00:17 +00:00
parent a2fdd857ac
commit 9bbd180e39
5 changed files with 14 additions and 9 deletions

View File

@@ -89,6 +89,7 @@ const wxRect kDummyRect = wxRect(-9999, -9999, 0, 0);
enum {
kToggleButtonID = 5000,
kTimerID
};
WX_DEFINE_OBJARRAY(wxArrayRect);
@@ -107,7 +108,7 @@ public:
BEGIN_EVENT_TABLE(ExpandingToolBar, wxPanel)
EVT_SIZE(ExpandingToolBar::OnSize)
EVT_TIMER(wxID_ANY, ExpandingToolBar::OnTimer)
EVT_TIMER(kTimerID, ExpandingToolBar::OnTimer)
EVT_BUTTON(kToggleButtonID, ExpandingToolBar::OnToggle)
END_EVENT_TABLE()
@@ -164,7 +165,7 @@ ExpandingToolBar::ExpandingToolBar(wxWindow* parent,
mToggleButton->UseDisabledAsDownHiliteImage(true);
SetAutoLayout(true);
mTimer.SetOwner(this, wxID_ANY);
mTimer.SetOwner(this, kTimerID);
}
ExpandingToolBar::~ExpandingToolBar()