Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-17 22:21:17 +01:00
Code Issues Releases Wiki Activity

Pass tooltips by wxString, not const wxChar*

Browse Source
This commit is contained in:
Paul Licameli
2015-07-06 17:20:48 -04:00
parent 4a4918a3f8
commit edba89d704
6 changed files with 53 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ondemand/ODManager.cpp
View File

@@ -541,12 +541,12 @@ bool ODManager::HasLoadedODFlag()
}
///fills in the status bar message for a given track
void ODManager::FillTipForWaveTrack( WaveTrack * t, const wxChar ** ppTip )
void ODManager::FillTipForWaveTrack( WaveTrack * t, wxString &tip )
{
mQueuesMutex.Lock();
for(unsigned int i=0;i<mQueues.size();i++)
{
mQueues[i]->FillTipForWaveTrack(t,ppTip);
mQueues[i]->FillTipForWaveTrack(t, tip);
}
mQueuesMutex.Unlock();
}

2
src/ondemand/ODManager.h
View File

@@ -98,7 +98,7 @@ class ODManager
static bool IsInstanceCreated();
///fills in the status bar message for a given track
void FillTipForWaveTrack( WaveTrack * t, const wxChar ** ppTip );
void FillTipForWaveTrack( WaveTrack * t, wxString &tip );
///Gets the total percent complete for all tasks combined.
float GetOverallPercentComplete();

4
src/ondemand/ODWaveTrackTaskQueue.cpp
View File

@@ -325,7 +325,7 @@ ODTask* ODWaveTrackTaskQueue::GetFrontTask()
}
///fills in the status bar message for a given track
void ODWaveTrackTaskQueue::FillTipForWaveTrack( WaveTrack * t, const wxChar ** ppTip )
void ODWaveTrackTaskQueue::FillTipForWaveTrack( WaveTrack * t, wxString &tip )
{
if(ContainsWaveTrack(t) && GetNumTasks())
{
@@ -335,7 +335,7 @@ void ODWaveTrackTaskQueue::FillTipForWaveTrack( WaveTrack * t, const wxChar ** p
// else
// msg.Printf(_("%s %d additional tasks remaining."), GetFrontTask()->GetTip().c_str(), GetNumTasks());
*ppTip = mTipMsg.c_str();
tip = mTipMsg.c_str();
}
}

2
src/ondemand/ODWaveTrackTaskQueue.h
View File

@@ -92,7 +92,7 @@ class ODWaveTrackTaskQueue
ODTask* GetTask(size_t x);
///fills in the status bar message for a given track
void FillTipForWaveTrack( WaveTrack * t, const wxChar ** ppTip );
void FillTipForWaveTrack( WaveTrack * t, wxString &tip );
protected: