Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-22 14:32:58 +02:00
Code Issues Releases Wiki Activity

Put the theme data in .rdata/.rodata

Browse Source
This commit is contained in:
Henric Jungheim
2017-07-12 11:56:21 -07:00
committed by James Crook
parent 14d0d8a051
commit 48edd2298a
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Theme.cpp
View File

@@ -192,16 +192,16 @@ WX_DEFINE_USER_EXPORTED_OBJARRAY( ArrayOfColours )
// Include the ImageCache... // Include the ImageCache...
static unsigned char DarkImageCacheAsData[] = { static const unsigned char DarkImageCacheAsData[] = {
#include "DarkThemeAsCeeCode.h" #include "DarkThemeAsCeeCode.h"
}; };
static unsigned char LightImageCacheAsData[] = { static const unsigned char LightImageCacheAsData[] = {
#include "LightThemeAsCeeCode.h" #include "LightThemeAsCeeCode.h"
}; };
static unsigned char ClassicImageCacheAsData[] = { static const unsigned char ClassicImageCacheAsData[] = {
#include "ClassicThemeAsCeeCode.h" #include "ClassicThemeAsCeeCode.h"
}; };
static unsigned char HiContrastImageCacheAsData[] = { static const unsigned char HiContrastImageCacheAsData[] = {
#include "HiContrastThemeAsCeeCode.h" #include "HiContrastThemeAsCeeCode.h"
}; };
@@ -963,24 +963,24 @@ bool ThemeBase::ReadImageCache( teThemeType type, bool bOkIfNotFound)
else else
{ {
size_t ImageSize = 0; size_t ImageSize = 0;
char * pImage = NULL; const unsigned char * pImage = nullptr;
switch( type ){ switch( type ){
default: default:
case themeClassic : case themeClassic :
ImageSize = sizeof(ClassicImageCacheAsData); ImageSize = sizeof(ClassicImageCacheAsData);
pImage = (char *)ClassicImageCacheAsData; pImage = ClassicImageCacheAsData;
break; break;
case themeLight : case themeLight :
ImageSize = sizeof(LightImageCacheAsData); ImageSize = sizeof(LightImageCacheAsData);
pImage = (char *)LightImageCacheAsData; pImage = LightImageCacheAsData;
break; break;
case themeDark : case themeDark :
ImageSize = sizeof(DarkImageCacheAsData); ImageSize = sizeof(DarkImageCacheAsData);
pImage = (char *)DarkImageCacheAsData; pImage = DarkImageCacheAsData;
break; break;
case themeHiContrast : case themeHiContrast :
ImageSize = sizeof(HiContrastImageCacheAsData); ImageSize = sizeof(HiContrastImageCacheAsData);
pImage = (char *)HiContrastImageCacheAsData; pImage = HiContrastImageCacheAsData;
break; break;
} }