From 9a2a524f1e311853d08050be2dcdddc09ac7759a Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:01:29 +0200 Subject: 3.0 --- RealtimeSync/resources.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'RealtimeSync/resources.cpp') 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 #include #include -//#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 -- cgit