Make app icon unthemable

In preparation for the new theme system, make the app icon unthemable since it won't be themable anyways when the new theme system is implemented. Signed-off-by: Avery King <[email protected]>
tenacityteam · Aug 6, 2024 · fb4a1c1 · fb4a1c1
1 parent 01a6151
commit fb4a1c1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -43,6 +43,7 @@
 #include <lib-files/wxFileNameWrapper.h>
 #include <lib-preferences/Prefs.h>
 
+#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 -----