summaryrefslogtreecommitdiff
path: root/RealtimeSync/resources.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'RealtimeSync/resources.cpp')
-rw-r--r--RealtimeSync/resources.cpp6
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
bgstack15