diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:24:35 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:24:35 +0200 |
| commit | 460091fb0b2ff114cc741372f15bb43b702ea3b1 (patch) | |
| tree | 0562c2eda4c66969c6e6d0910080db9f5b0def3e /lib/resources.cpp | |
| parent | 5.15 (diff) | |
| download | FreeFileSync-460091fb0b2ff114cc741372f15bb43b702ea3b1.tar.gz FreeFileSync-460091fb0b2ff114cc741372f15bb43b702ea3b1.tar.bz2 FreeFileSync-460091fb0b2ff114cc741372f15bb43b702ea3b1.zip | |
5.16
Diffstat (limited to 'lib/resources.cpp')
| -rw-r--r-- | lib/resources.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/resources.cpp b/lib/resources.cpp index e6691458..6f48e2e1 100644 --- a/lib/resources.cpp +++ b/lib/resources.cpp @@ -75,17 +75,17 @@ GlobalResources::GlobalResources() #ifdef FFS_WIN //for compatibility it seems we need to stick with a "real" icon - programIcon = wxIcon(L"A_PROGRAM_ICON"); + programIconFFS = wxIcon(L"A_FFS_ICON"); #elif defined FFS_LINUX //attention: make sure to not implicitly call "instance()" again => deadlock on Linux - programIcon.CopyFromBitmap(getImage(L"FreeFileSync")); //use big logo bitmap for better quality + programIconFFS.CopyFromBitmap(getImage(L"FreeFileSync")); //use big logo bitmap for better quality #elif defined FFS_MAC assert(getImage(L"FreeFileSync").GetWidth () == getImage(L"FreeFileSync").GetHeight() && getImage(L"FreeFileSync").GetWidth() % 128 == 0); //wxWidgets' bitmap to icon conversion on OS X can only deal with very specific sizes - programIcon.CopyFromBitmap(getImage(L"FreeFileSync").ConvertToImage().Scale(128, 128, wxIMAGE_QUALITY_HIGH)); //"von hinten durch die Brust ins Auge" + programIconFFS.CopyFromBitmap(getImage(L"FreeFileSync").ConvertToImage().Scale(128, 128, wxIMAGE_QUALITY_HIGH)); //"von hinten durch die Brust ins Auge" #endif } |