diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp index b647c921d..5304a759b 100644 --- a/src/AboutDialog.cpp +++ b/src/AboutDialog.cpp @@ -49,7 +49,7 @@ WX_DEFINE_LIST(AboutDialogCreditItemsList); #include "Theme.h" #include "AllThemeResources.h" -//#include "../images/AudacityLogo.xpm" +#include "../images/AudacityLogoWithName.xpm" void AboutDialog::CreateCreditsList() { diff --git a/src/AllThemeResources.h b/src/AllThemeResources.h index 93b3b00a3..55bc57f7e 100644 --- a/src/AllThemeResources.h +++ b/src/AllThemeResources.h @@ -206,13 +206,16 @@ from there. Audacity will look for a file called "Pause.png". #define LOGOWITHNAME_HEIGHT 200 //vvv For now, do the new image the old-fashioned way, not via Theme. // DEFINE_IMAGE(bmpAudacityLogoWithName, wxImage(LOGOWITHNAME_WIDTH, LOGOWITHNAME_HEIGHT), wxT("AudacityLogoWithName")); -#ifndef HAVE_AUDACITYLOGOWITHNAME - #define HAVE_AUDACITYLOGOWITHNAME - #include "../images/AudacityLogoWithName.xpm" -#ifdef __WXGTK__ - #include "../images/AudacityLogoAlpha.xpm" -#endif -#endif + +// AWD: no sense in statically building the XPM into every file that includes +// this one; the few that need it should include it themselves. +//#ifndef HAVE_AUDACITYLOGOWITHNAME +// #define HAVE_AUDACITYLOGOWITHNAME +// #include "../images/AudacityLogoWithName.xpm" +//#ifdef __WXGTK__ +// #include "../images/AudacityLogoAlpha.xpm" +//#endif +//#endif DEFINE_IMAGE( bmpAudacityLogo, wxImage( 215, 190 ), wxT("AudacityLogo")); //vvv DEFINE_IMAGE( bmpAudacityLogo48x48, wxImage( 48, 48 ), wxT("AudacityLogo48x48")); diff --git a/src/Project.cpp b/src/Project.cpp index a6d1a3bcf..7e6821a0c 100644 --- a/src/Project.cpp +++ b/src/Project.cpp @@ -159,6 +159,8 @@ scroll information. It also has some status flags. #include "CaptureEvents.h" +#include "../images/AudacityLogoAlpha.xpm" + TrackList *AudacityProject::msClipboard = new TrackList(); double AudacityProject::msClipLen = 0.0; AudacityProject *AudacityProject::msClipProject = NULL; diff --git a/src/SplashDialog.cpp b/src/SplashDialog.cpp index c0f8c441c..08ced23c3 100644 --- a/src/SplashDialog.cpp +++ b/src/SplashDialog.cpp @@ -42,6 +42,8 @@ most commonly asked questions about Audacity. #include "Prefs.h" #include "HelpText.h" +#include "../images/AudacityLogoWithName.xpm" + SplashDialog * SplashDialog::pSelf=NULL; enum