wxMSW 2.8.11 doesn't allow multiple timers to have the same ID, so use wxID_ANY

for timers

src/widgets/ExpandingToolBar.cpp

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

src/widgets/Meter.cpp

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