mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-27 08:04:14 +00:00
62 lines
2.2 KiB
Diff
62 lines
2.2 KiB
Diff
|
--- Main/Resources.cpp 2016-05-16 16:47:35.846462041 +0200
|
||
|
|
+++ Main/Resources.cpp 2016-05-16 17:12:21.838202520 +0200
|
||
|
|
@@ -45,13 +45,13 @@
|
||
|
|
strBuf.CopyFrom (res);
|
||
|
|
return string (reinterpret_cast <char *> (strBuf.Ptr()));
|
||
|
|
#else
|
||
|
|
- static const char LanguageXml[] =
|
||
|
|
+ static byte LanguageXml[] =
|
||
|
|
{
|
||
|
|
# include "Common/Language.xml.h"
|
||
|
|
, 0
|
||
|
|
};
|
||
|
|
|
||
|
|
- return string (LanguageXml);
|
||
|
|
+ return string ((const char*) LanguageXml);
|
||
|
|
#endif
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -64,13 +64,13 @@
|
||
|
|
strBuf.CopyFrom (res);
|
||
|
|
return string (reinterpret_cast <char *> (strBuf.Ptr()));
|
||
|
|
#else
|
||
|
|
- static const char License[] =
|
||
|
|
+ static byte License[] =
|
||
|
|
{
|
||
|
|
# include "License.txt.h"
|
||
|
|
, 0
|
||
|
|
};
|
||
|
|
|
||
|
|
- return string (License);
|
||
|
|
+ return string ((const char*) License);
|
||
|
|
#endif
|
||
|
|
}
|
||
|
|
|
||
|
|
--- Main/Forms/PreferencesDialog.cpp 2016-05-16 17:14:47.704707908 +0200
|
||
|
|
+++ Main/Forms/PreferencesDialog.cpp 2016-05-16 17:15:56.927964437 +0200
|
||
|
|
@@ -414,11 +414,11 @@
|
||
|
|
libExtension = wxDynamicLibrary::CanonicalizeName (L"x");
|
||
|
|
|
||
|
|
#ifdef TC_MACOSX
|
||
|
|
- extensions.push_back (make_pair (L"dylib", LangString["DLL_FILES"]));
|
||
|
|
+ extensions.push_back (make_pair (L"dylib", static_cast<const wchar_t*>(LangString["DLL_FILES"].wc_str())));
|
||
|
|
#endif
|
||
|
|
if (!libExtension.empty())
|
||
|
|
{
|
||
|
|
- extensions.push_back (make_pair (libExtension.Mid (libExtension.find (L'.') + 1), LangString["DLL_FILES"]));
|
||
|
|
+ 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())));
|
||
|
|
extensions.push_back (make_pair (L"*", L""));
|
||
|
|
}
|
||
|
|
|
||
|
|
--- Main/GraphicUserInterface.cpp 2016-05-16 17:16:38.724591342 +0200
|
||
|
|
+++ Main/GraphicUserInterface.cpp 2016-05-16 17:17:09.854562653 +0200
|
||
|
|
@@ -1445,7 +1445,7 @@
|
||
|
|
FilePath GraphicUserInterface::SelectVolumeFile (wxWindow *parent, bool saveMode, const DirectoryPath &directory) const
|
||
|
|
{
|
||
|
|
list < pair <wstring, wstring> > extensions;
|
||
|
|
- extensions.push_back (make_pair (L"tc", LangString["TC_VOLUMES"]));
|
||
|
|
+ extensions.push_back (make_pair (L"tc", static_cast<const wchar_t*>(LangString["TC_VOLUMES"].wc_str())));
|
||
|
|
|
||
|
|
FilePathList selFiles = Gui->SelectFiles (parent, LangString[saveMode ? "OPEN_NEW_VOLUME" : "OPEN_VOL_TITLE"], saveMode, false, extensions, directory);
|
||
|
|
|