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

src/widgets/ExpandingToolBar.cpp

@@ -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()

src/widgets/Meter.cpp

@@ -168,7 +168,8 @@ bool MeterUpdateQueue::Get(MeterUpdateMsg &msg)
 //
 
 enum {
-   OnDisableMeterID = 6000,
+   OnMeterUpdateID = 6000,
+   OnDisableMeterID,
    OnMonitorID,
    OnHorizontalID,
    OnAutomatedInputLevelAdjustmentID,
@@ -184,7 +185,7 @@ enum {
 };
 
 BEGIN_EVENT_TABLE(Meter, wxPanel)
-   EVT_TIMER(wxID_ANY, Meter::OnMeterUpdate)
+   EVT_TIMER(OnMeterUpdateID, Meter::OnMeterUpdate)
    EVT_MOUSE_EVENTS(Meter::OnMouse)
    EVT_ERASE_BACKGROUND(Meter::OnErase)
    EVT_PAINT(Meter::OnPaint)
@@ -284,7 +285,7 @@ Meter::Meter(wxWindow* parent, wxWindowID id,
 
    mRuler.SetFonts(GetFont(), GetFont(), GetFont());
 
-   mTimer.SetOwner(this, wxID_ANY);
+   mTimer.SetOwner(this, OnMeterUpdateID);
    Reset(44100.0, true);
    for(i=0; i<kMaxMeterBars; i++) {
       mBar[i].clipping = false;