Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-01-15 17:11:23 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' into datidy

Browse Source 
Conflicts resolved by hand:
	src/AColor.cpp
	src/AboutDialog.cpp
	src/Audacity.h
	src/import/ImportGStreamer.cpp
This commit is contained in:
James Crook
2016-09-11 13:23:02 +01:00
parent 8ae903babd 545d741eb2
commit cde80d1918
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/AColor.cpp
View File

@@ -228,6 +228,19 @@ void AColor::Bevel(wxDC & dc, bool up, const wxRect & r)
AColor::Line(dc, r.x, r.y + r.height, r.x + r.width, r.y + r.height);
}
void AColor::Bevel2(wxDC & dc, bool up, const wxRect & r)
{
wxBitmap & Bmp = theTheme.Bitmap( up ? bmpUpButtonLarge : bmpDownButtonLarge );
wxMemoryDC memDC;
memDC.SelectObject(Bmp);
int h = wxMin( r.height, Bmp.GetHeight() );
dc.Blit( r.x,r.y,r.width/2, h, &memDC, 0, 0 );
dc.Blit( r.x+r.width/2,r.y,r.width/2, h, &memDC,
Bmp.GetWidth() - r.width/2, 0 );
}
void AColor::Bevel2(wxDC & dc, bool up, const wxRect & r)
{
wxBitmap & Bmp = theTheme.Bitmap( up ? bmpUpButtonExpand : bmpDownButtonExpand );

2
src/AboutDialog.cpp
View File

@@ -592,7 +592,7 @@ void AboutDialog::PopulateInformationPage( ShuttleGui & S )
// Uncomment the next two lines to test hyperlinks work from here.
// AddBuildinfoRow(&informationStr, wxT("Link Test:"),
// wxT("[[https:web.audacityteam.org|Click bait]]") );
// wxT("[[https:www.audacityteam.org|Click bait]]") );
AddBuildinfoRow(&informationStr, _("Commit Id:"),
#include "RevisionIdent.h"

2
src/import/ImportGStreamer.cpp
View File

@@ -264,7 +264,7 @@ void
GetGStreamerImportPlugin(ImportPluginList &importPluginList,
UnusableImportPluginList & WXUNUSED(unusableImportPluginList))
{
wxLogMessage( _TS("Audacity is built against GStreamer version %d.%d.%d-%d"),
wxLogMessage(_TS("Audacity is built against GStreamer version %d.%d.%d-%d"),
GST_VERSION_MAJOR,
GST_VERSION_MINOR,
GST_VERSION_MICRO,