Fix app icon

- Reapply commit fb4a1c1857
- Use TenacityLogo instead of AudacityLogo

Signed-off-by: Avery King <gperson@disroot.org>

libraries/lib-wx-init/HelpSystem.cpp

@@ -41,6 +41,8 @@
 #include "Prefs.h"
 #include "wxFileNameWrapper.h"
 
+#include "../../images/TenacityLogo.xpm"
+
 #include "BasicUI.h"
 
 const wxString HelpSystem::HelpHostname = wxT("manual.audacityteam.org");
@@ -196,12 +198,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) };
    pFrame->SetIcon( ic );
    // -- END of ICON stuff -----
 

libraries/lib-wx-init/LogWindow.cpp

@@ -92,12 +92,9 @@ void LogWindow::Show(bool show)
    {
 #if !defined(__WXMAC__) && !defined(__WXX11__)
 #if defined(__WXMSW__)
-      wxIcon ic{wxICON(AudacityLogo)};
-#elif defined(__WXGTK__)
-      wxIcon ic{wxICON(TenacityLogoAlpha)};
+      wxIcon ic{wxICON(TenacityLogo)};
 #else
-      wxIcon ic{};
-      ic.CopyFromBitmap(theTheme.Bitmap(bmpAudacityLogo48x48));
+      wxIcon ic{wxICON(TenacityLogoAlpha)};
 #endif
       frame->SetIcon(ic);
 #endif

src/ProjectManager.cpp

@@ -283,12 +283,9 @@ void InitProjectWindow( ProjectWindow &window )
 #if !defined(__WXMAC__) && !defined(__WXX11__)
    {
 #if defined(__WXMSW__)
-      wxIcon ic{ wxICON(AudacityLogo) };
-#elif defined(__WXGTK__)
-      wxIcon ic{wxICON(TenacityLogoAlpha)};
+      wxIcon ic{ wxICON(TenacityLogo) };
 #else
-      wxIcon ic{};
-      ic.CopyFromBitmap(theTheme.Bitmap(bmpAudacityLogo48x48));
+      wxIcon ic{wxICON(TenacityLogoAlpha)};
 #endif
       window.SetIcon(ic);
    }