Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-09-18 17:10:55 +02:00
Code Issues Releases Wiki Activity

Bug 1685: garbage status bar messages and tooltips, scrub in Windows

Browse Source
This commit is contained in:
Paul Licameli 2017-07-14 23:02:32 -04:00
parent 558efda20c
commit 812f3649de
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/toolbars/ToolsToolBar.cpp
View File

@ -270,7 +270,7 @@ int ToolsToolBar::GetDownTool()
return firstTool; // Should never happen return firstTool; // Should never happen
} }
const wxChar * ToolsToolBar::GetMessageForTool( int ToolNumber ) const wxString ToolsToolBar::GetMessageForTool( int ToolNumber ) const
{ {
wxASSERT( ToolNumber >= 0 ); wxASSERT( ToolNumber >= 0 );
wxASSERT( ToolNumber < numTools ); wxASSERT( ToolNumber < numTools );

2
src/toolbars/ToolsToolBar.h
View File

@ -62,7 +62,7 @@ class ToolsToolBar final : public ToolBar {
bool IsDown(int tool) const; bool IsDown(int tool) const;
int GetDownTool(); int GetDownTool();
const wxChar * GetMessageForTool( int ToolNumber ) const; wxString GetMessageForTool( int ToolNumber ) const;
void Populate(); void Populate();
void Repaint(wxDC * WXUNUSED(dc)) override {}; void Repaint(wxDC * WXUNUSED(dc)) override {};

4
src/tracks/ui/Scrubbing.cpp
View File

@ -959,9 +959,9 @@ const wxString &Scrubber::GetUntranslatedStateString() const
return empty; return empty;
} }
const wxString & Scrubber::StatusMessageForWave() const wxString Scrubber::StatusMessageForWave() const
{ {
static wxString result; wxString result;
result = ""; result = "";
if( Seeks() ) if( Seeks() )

2
src/tracks/ui/Scrubbing.h
View File

@ -130,7 +130,7 @@ public:
// A string to put in the leftmost part of the status bar // A string to put in the leftmost part of the status bar
// when scrub or seek is in progress, or else empty. // when scrub or seek is in progress, or else empty.
const wxString &GetUntranslatedStateString() const; const wxString &GetUntranslatedStateString() const;
const wxString &StatusMessageForWave() const; wxString StatusMessageForWave() const;
// All possible status strings. // All possible status strings.
static std::vector<wxString> GetAllUntranslatedStatusStrings(); static std::vector<wxString> GetAllUntranslatedStatusStrings();