Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-03-08 07:25:39 +01:00
Code Issues Releases Wiki Activity

Preliminary changes for wxWidgets 3.0.1

Browse Source 
We can't go to 3.0.1 yet as there are still build issues on
Linux and OSX.  You can get Windows to build, but there's
still some display issues.

These changes should work with wxWidgets 2.8.12 as well, so
we can take our time to get things working properly before
switching over.
This commit is contained in:
lllucius
2014-10-06 08:10:50 +00:00
parent 0933da5b60
commit bdcefb4850
54 changed files with 252 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/toolbars/ToolsToolBar.cpp
View File

@@ -57,23 +57,6 @@
IMPLEMENT_CLASS(ToolsToolBar, ToolBar);
// Strings to convert a tool number into a status message
// These MUST be in the same order as the ids above.
static const wxChar * MessageOfTool[numTools] = {
wxTRANSLATE("Click and drag to select audio"),
wxTRANSLATE("Click and drag to edit the amplitude envelope"),
wxTRANSLATE("Click and drag to edit the samples"),
#if defined( __WXMAC__ )
wxTRANSLATE("Click to Zoom In, Shift-Click to Zoom Out"),
#elif defined( __WXMSW__ )
wxTRANSLATE("Drag to Zoom Into Region, Right-Click to Zoom Out"),
#elif defined( __WXGTK__ )
wxTRANSLATE("Left=Zoom In, Right=Zoom Out, Middle=Normal"),
#endif
wxTRANSLATE("Click and drag to move a track in time"),
wxT("") // multi-mode tool
};
////////////////////////////////////////////////////////////
/// Methods for ToolsToolBar
////////////////////////////////////////////////////////////
@@ -96,6 +79,19 @@ ToolsToolBar::ToolsToolBar()
wxASSERT( zoomTool == zoomTool - firstTool );
wxASSERT( drawTool == drawTool - firstTool );
wxASSERT( multiTool == multiTool - firstTool );
mMessageOfTool[selectTool] = _("Click and drag to select audio");
mMessageOfTool[envelopeTool] = _("Click and drag to edit the amplitude envelope");
mMessageOfTool[slideTool] = _("Click and drag to edit the samples");
#if defined( __WXMAC__ )
mMessageOfTool[zoomTool] = _("Click to Zoom In, Shift-Click to Zoom Out");
#elif defined( __WXMSW__ )
mMessageOfTool[zoomTool] = _("Drag to Zoom Into Region, Right-Click to Zoom Out");
#elif defined( __WXGTK__ )
mMessageOfTool[zoomTool] = _("Left=Zoom In, Right=Zoom Out, Middle=Normal");
#endif
mMessageOfTool[drawTool] = _("Click and drag to move a track in time");
mMessageOfTool[multiTool] = wxT(""); // multi-mode tool
}
ToolsToolBar::~ToolsToolBar()
@@ -258,7 +254,8 @@ const wxChar * ToolsToolBar::GetMessageForTool( int ToolNumber )
{
wxASSERT( ToolNumber >= 0 );
wxASSERT( ToolNumber < numTools );
return wxGetTranslation(MessageOfTool[ ToolNumber ]);
return mMessageOfTool[ToolNumber];
}