diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:01:29 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:01:29 +0200 |
| commit | 9a2a524f1e311853d08050be2dcdddc09ac7759a (patch) | |
| tree | d8e4a24169fce88c2d89931d58514889a0bcb0ea /library/resources.cpp | |
| parent | 2.3 (diff) | |
| download | FreeFileSync-9a2a524f1e311853d08050be2dcdddc09ac7759a.tar.gz FreeFileSync-9a2a524f1e311853d08050be2dcdddc09ac7759a.tar.bz2 FreeFileSync-9a2a524f1e311853d08050be2dcdddc09ac7759a.zip | |
3.0
Diffstat (limited to 'library/resources.cpp')
| -rw-r--r-- | library/resources.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/library/resources.cpp b/library/resources.cpp index 1b9ce12d..a42f2788 100644 --- a/library/resources.cpp +++ b/library/resources.cpp @@ -4,10 +4,13 @@ #include <wx/image.h> #include <wx/icon.h> #include <wx/mstream.h> +#include "../shared/stringConv.h" #include "../shared/systemConstants.h" #include <memory> #include "../shared/standardPaths.h" +using namespace FreeFileSync; + const GlobalResources& GlobalResources::getInstance() { @@ -127,7 +130,9 @@ GlobalResources::GlobalResources() bitmapResource[wxT("france.png")] = (bitmapFrance = new wxBitmap(wxNullBitmap)); bitmapResource[wxT("germany.png")] = (bitmapGermany = new wxBitmap(wxNullBitmap)); bitmapResource[wxT("hungary.png")] = (bitmapHungary = new wxBitmap(wxNullBitmap)); + bitmapResource[wxT("romania.png")] = (bitmapRomania = new wxBitmap(wxNullBitmap)); bitmapResource[wxT("taiwan.png")] = (bitmapTaiwan = new wxBitmap(wxNullBitmap)); + bitmapResource[wxT("turkey.png")] = (bitmapTurkey = new wxBitmap(wxNullBitmap)); bitmapResource[wxT("italy.png")] = (bitmapItaly = new wxBitmap(wxNullBitmap)); bitmapResource[wxT("japan.png")] = (bitmapJapan = new wxBitmap(wxNullBitmap)); bitmapResource[wxT("poland.png")] = (bitmapPoland = new wxBitmap(wxNullBitmap)); @@ -213,7 +218,7 @@ void loadAnimFromZip(wxZipInputStream& zipInput, wxAnimation* animation) void GlobalResources::load() const { - wxFFileInputStream input(FreeFileSync::getInstallationDir() + globalFunctions::FILE_NAME_SEPARATOR + wxT("Resources.dat")); + wxFFileInputStream input(FreeFileSync::getInstallationDir() + zToWx(globalFunctions::FILE_NAME_SEPARATOR) + wxT("Resources.dat")); if (input.IsOk()) //if not... we don't want to react too harsh here { //activate support for .png files |