diff --git a/src/LogWindow.cpp b/src/LogWindow.cpp index ee6c0f3600..47fdc1f2d0 100644 --- a/src/LogWindow.cpp +++ b/src/LogWindow.cpp @@ -95,11 +95,8 @@ void LogWindow::Show(bool show) #if !defined(__WXMAC__) && !defined(__WXX11__) #if defined(__WXMSW__) wxIcon ic{wxICON(TenacityLogo)}; -#elif defined(__WXGTK__) - wxIcon ic{wxICON(TenacityLogoAlpha)}; #else - wxIcon ic{}; - ic.CopyFromBitmap(theTheme.Bitmap(bmpAudacityLogo48x48)); + wxIcon ic{wxICON(TenacityLogoAlpha)}; #endif frame->SetIcon(ic); #endif diff --git a/src/ProjectManager.cpp b/src/ProjectManager.cpp index f684900bc8..85b20524d9 100644 --- a/src/ProjectManager.cpp +++ b/src/ProjectManager.cpp @@ -403,11 +403,8 @@ void InitProjectWindow( ProjectWindow &window ) { #if defined(__WXMSW__) wxIcon ic{ wxICON(TenacityLogo) }; -#elif defined(__WXGTK__) - wxIcon ic{wxICON(TenacityLogoAlpha)}; #else - wxIcon ic{}; - ic.CopyFromBitmap(theTheme.Bitmap(bmpAudacityLogo48x48)); + wxIcon ic{wxICON(TenacityLogoAlpha)}; #endif window.SetIcon(ic); } diff --git a/src/theme/AllThemeResources.h b/src/theme/AllThemeResources.h index 3285e8d278..3f423d941e 100644 --- a/src/theme/AllThemeResources.h +++ b/src/theme/AllThemeResources.h @@ -233,7 +233,7 @@ from there. Audacity will look for a file called "Pause.png". #define LOGOWITHNAME_HEIGHT 200 SET_THEME_FLAGS( resFlagNewLine ); - DEFINE_IMAGE( bmpAudacityLogo48x48, wxImage( 48, 48 ), wxT("TenacityLogo48x48")); + DEFINE_IMAGE( bmpAudacityLogo48x48, wxImage( 48, 48 ), wxT("TenacityLogo48x48")); // UNUSED DEFINE_COLOUR( clrBlank, wxColour( 64, 64, 64), wxT("Blank")); diff --git a/src/widgets/HelpSystem.cpp b/src/widgets/HelpSystem.cpp index f2f58ba792..cf7cf7b82d 100644 --- a/src/widgets/HelpSystem.cpp +++ b/src/widgets/HelpSystem.cpp @@ -43,6 +43,7 @@ #include #include +#include "../images/TenacityLogo.xpm" #include "../theme/AllThemeResources.h" #include "../shuttle/ShuttleGui.h" #include "../theme/Theme.h" @@ -111,12 +112,7 @@ void HelpSystem::ShowHtmlText(wxWindow *pParent, // -- START of ICON stuff ----- // If this section (providing an icon) causes compilation errors on linux, comment it out for now. // it will just mean that the icon is missing. Works OK on Windows. - #ifdef __WXMSW__ - wxIcon ic{ wxICON(AudacityLogo) }; - #else - wxIcon ic{}; - ic.CopyFromBitmap(theTheme.Bitmap(bmpAudacityLogo48x48)); - #endif + wxIcon ic{ wxICON(TenacityLogo) }; pWnd.SetIcon( ic ); // -- END of ICON stuff -----