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 /RealtimeSync/resources.cpp | |
| parent | 2.3 (diff) | |
| download | FreeFileSync-9a2a524f1e311853d08050be2dcdddc09ac7759a.tar.gz FreeFileSync-9a2a524f1e311853d08050be2dcdddc09ac7759a.tar.bz2 FreeFileSync-9a2a524f1e311853d08050be2dcdddc09ac7759a.zip | |
3.0
Diffstat (limited to 'RealtimeSync/resources.cpp')
| -rw-r--r-- | RealtimeSync/resources.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/RealtimeSync/resources.cpp b/RealtimeSync/resources.cpp index 979b5ecb..37a0bb43 100644 --- a/RealtimeSync/resources.cpp +++ b/RealtimeSync/resources.cpp @@ -4,10 +4,12 @@ #include <wx/image.h> #include <wx/icon.h> #include <memory> -//#include "../shared/globalFunctions.h" +#include "../shared/stringConv.h" #include "../shared/standardPaths.h" #include "../shared/systemConstants.h" +using namespace FreeFileSync; + const GlobalResources& GlobalResources::getInstance() { @@ -40,7 +42,7 @@ GlobalResources::~GlobalResources() 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 |