pyrox.dev
1--- Main/Resources.cpp 2016-05-16 16:47:35.846462041 +0200
2+++ Main/Resources.cpp 2016-05-16 17:12:21.838202520 +0200
3@@ -45,13 +45,13 @@
4 strBuf.CopyFrom (res);
5 return string (reinterpret_cast <char *> (strBuf.Ptr()));
6 #else
7- static const char LanguageXml[] =
8+ static byte LanguageXml[] =
9 {
10 # include "Common/Language.xml.h"
11 , 0
12 };
13
14- return string (LanguageXml);
15+ return string ((const char*) LanguageXml);
16 #endif
17 }
18
19@@ -64,13 +64,13 @@
20 strBuf.CopyFrom (res);
21 return string (reinterpret_cast <char *> (strBuf.Ptr()));
22 #else
23- static const char License[] =
24+ static byte License[] =
25 {
26 # include "License.txt.h"
27 , 0
28 };
29
30- return string (License);
31+ return string ((const char*) License);
32 #endif
33 }
34
35--- Main/Forms/PreferencesDialog.cpp 2016-05-16 17:14:47.704707908 +0200
36+++ Main/Forms/PreferencesDialog.cpp 2016-05-16 17:15:56.927964437 +0200
37@@ -414,11 +414,11 @@
38 libExtension = wxDynamicLibrary::CanonicalizeName (L"x");
39
40 #ifdef TC_MACOSX
41- extensions.push_back (make_pair (L"dylib", LangString["DLL_FILES"]));
42+ extensions.push_back (make_pair (L"dylib", static_cast<const wchar_t*>(LangString["DLL_FILES"].wc_str())));
43 #endif
44 if (!libExtension.empty())
45 {
46- extensions.push_back (make_pair (libExtension.Mid (libExtension.find (L'.') + 1), LangString["DLL_FILES"]));
47+ extensions.push_back (make_pair (static_cast<const wchar_t*>(libExtension.Mid (libExtension.find (L'.') + 1).wc_str()), static_cast<const wchar_t*>(LangString["DLL_FILES"].wc_str())));
48 extensions.push_back (make_pair (L"*", L""));
49 }
50
51--- Main/GraphicUserInterface.cpp 2016-05-16 17:16:38.724591342 +0200
52+++ Main/GraphicUserInterface.cpp 2016-05-16 17:17:09.854562653 +0200
53@@ -1445,7 +1445,7 @@
54 FilePath GraphicUserInterface::SelectVolumeFile (wxWindow *parent, bool saveMode, const DirectoryPath &directory) const
55 {
56 list < pair <wstring, wstring> > extensions;
57- extensions.push_back (make_pair (L"tc", LangString["TC_VOLUMES"]));
58+ extensions.push_back (make_pair (L"tc", static_cast<const wchar_t*>(LangString["TC_VOLUMES"].wc_str())));
59
60 FilePathList selFiles = Gui->SelectFiles (parent, LangString[saveMode ? "OPEN_NEW_VOLUME" : "OPEN_VOL_TITLE"], saveMode, false, extensions, directory);
61