Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-04-29 23:29:41 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Project.cpp
View File

@ -706,7 +706,7 @@ BEGIN_EVENT_TABLE(AudacityProject, wxFrame)
EVT_COMMAND_SCROLL_LINEDOWN(HSBarID, AudacityProject::OnScrollRightButton)
EVT_COMMAND_SCROLL(HSBarID, AudacityProject::OnScroll)
EVT_COMMAND_SCROLL(VSBarID, AudacityProject::OnScroll)
EVT_TIMER(wxID_ANY, AudacityProject::OnTimer)
EVT_TIMER(AudacityProjectTimerID, AudacityProject::OnTimer)
// Fires for menu with ID #1...first menu defined
EVT_UPDATE_UI(1, AudacityProject::OnUpdateUI)
EVT_ICONIZE(AudacityProject::OnIconize)
@ -992,7 +992,7 @@ AudacityProject::AudacityProject(wxWindow * parent, wxWindowID id,
mStatusBar->SetStatusText(msg);
mLastStatusUpdateTime = ::wxGetUTCTime();
mTimer = new wxTimer(this, wxID_ANY);
mTimer = new wxTimer(this, AudacityProjectTimerID);
mTimer->Start(200);
#if wxUSE_DRAG_AND_DROP

2
src/Project.h
View File

@ -40,6 +40,8 @@
#include <wx/intl.h>
#include <wx/dcclient.h>
const int AudacityProjectTimerID = 5200;
class wxWindow;
class wxDialog;
class wxBoxSizer;

5
src/TimerRecordDialog.cpp
View File

@ -34,6 +34,7 @@
#include "Internat.h"
#define MAX_PROG 1000
#define TIMER_ID 7000
enum { // control IDs
ID_DATEPICKER_START = 10000,
@ -61,7 +62,7 @@ BEGIN_EVENT_TABLE(TimerRecordDialog, wxDialog)
EVT_BUTTON(wxID_OK, TimerRecordDialog::OnOK)
EVT_TIMER(wxID_ANY, TimerRecordDialog::OnTimer)
EVT_TIMER(TIMER_ID, TimerRecordDialog::OnTimer)
END_EVENT_TABLE()
TimerRecordDialog::TimerRecordDialog(wxWindow* parent)
@ -87,7 +88,7 @@ TimerRecordDialog::TimerRecordDialog(wxWindow* parent)
m_pTimeTextCtrl_Duration->SetFocus();
m_pTimeTextCtrl_Duration->SetFieldFocus(3);
m_timer.SetOwner(this, wxID_ANY);
m_timer.SetOwner(this, TIMER_ID);
m_timer.Start(kTimerInterval);
}

5
src/widgets/ExpandingToolBar.cpp
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()

7
src/widgets/Meter.cpp
View File

@ -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;