rpm/megaglest
SHA256
1
0
Fork 0
forked from pool/megaglest
Code Pull Requests Activity
Files
factory
megaglest/wxwidgets3.patch

346 lines
17 KiB
Diff
Raw Permalink Blame History

diff -Nur megaglest-3.13.0/source/g3d_viewer/main.cpp new/source/g3d_viewer/main.cpp
--- megaglest-3.13.0/source/g3d_viewer/main.cpp 2017-03-08 22:46:57.000000000 +0100
+++ new/source/g3d_viewer/main.cpp 2017-03-11 13:52:19.151567564 +0100
@@ -37,6 +37,12 @@
#define _strnicmp strncasecmp
#endif
+#if wxCHECK_VERSION(2, 9, 1)
+ #define WX2CHR(x) (x.mb_str())
+#else
+ #define WX2CHR(x) (wxConvCurrent->cWX2MB(x))
+#endif
+
using namespace Shared::Platform;
using namespace Shared::PlatformCommon;
using namespace Shared::Graphics;
@@ -2130,8 +2136,12 @@
bool foundInvalidArgs = false;
const int knownArgCount = sizeof(GAME_ARGS) / sizeof(GAME_ARGS[0]);
for(int idx = 1; idx < argc; ++idx) {
+#if wxCHECK_VERSION(2, 9, 1)
+ const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(argv[idx].wc_str());
+#else
const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(argv[idx]);
- if( hasCommandArgument(knownArgCount, (wxChar**)&GAME_ARGS[0], (const char *)tmp_buf, NULL, 0, true) == false &&
+#endif
+if( hasCommandArgument(knownArgCount, (wxChar**)&GAME_ARGS[0], (const char *)tmp_buf, NULL, 0, true) == false &&
argv[idx][0] == '-') {
foundInvalidArgs = true;
@@ -2141,7 +2151,7 @@
if(foundInvalidArgs == true ||
hasCommandArgument(argc, argv,(const char *)wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_HELP])) == true) {
- printParameterHelp(wxConvCurrent->cWX2MB(argv[0]),foundInvalidArgs);
+ printParameterHelp(static_cast<const char*>(WX2CHR(argv[0])), foundInvalidArgs);
return false;
}
@@ -2161,7 +2171,11 @@
hasCommandArgument(argc, argv,(const char*)param,&foundParamIndIndex);
}
//printf("foundParamIndIndex = %d\n",foundParamIndIndex);
+#if wxCHECK_VERSION(2, 9, 1)
+ string options = argv[foundParamIndIndex].ToStdString();
+#else
string options = (const char *)wxConvCurrent->cWX2MB(argv[foundParamIndIndex]);
+#endif
vector<string> paramPartTokens;
Tokenize(options,paramPartTokens,"=");
if(paramPartTokens.size() >= 2 && paramPartTokens[1].length() > 0) {
@@ -2207,7 +2221,7 @@
hasCommandArgument(argc, argv,(const char*)param,&foundParamIndIndex);
}
//printf("foundParamIndIndex = %d\n",foundParamIndIndex);
- string customPath = (const char *)wxConvCurrent->cWX2MB(argv[foundParamIndIndex]);
+ string customPath = static_cast<const char*>(WX2CHR(argv[foundParamIndIndex]));
vector<string> paramPartTokens;
Tokenize(customPath,paramPartTokens,"=");
if(paramPartTokens.size() >= 2 && paramPartTokens[1].length() > 0) {
@@ -2233,15 +2247,15 @@
}
}
else {
- printf("\nInvalid path specified on commandline [%s] value [%s]\n\n",(const char *)wxConvCurrent->cWX2MB(argv[foundParamIndIndex]),(paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
- printParameterHelp(wxConvCurrent->cWX2MB(argv[0]),false);
+ printf("\nInvalid path specified on commandline [%s] value [%s]\n\n", static_cast<const char*>(WX2CHR(argv[foundParamIndIndex])), (paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
+ printParameterHelp(WX2CHR(argv[0]),false);
return false;
}
}
else {
- printf("\nInvalid path specified on commandline [%s] value [%s]\n\n",(const char *)wxConvCurrent->cWX2MB(argv[foundParamIndIndex]),(paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
- printParameterHelp(wxConvCurrent->cWX2MB(argv[0]),false);
+ printf("\nInvalid path specified on commandline [%s] value [%s]\n\n", static_cast<const char*>(WX2CHR(argv[foundParamIndIndex])),(paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
+ printParameterHelp(WX2CHR(argv[0]),false);
return false;
}
}
@@ -2257,7 +2271,7 @@
hasCommandArgument(argc, argv,(const char*)param,&foundParamIndIndex);
}
//printf("foundParamIndIndex = %d\n",foundParamIndIndex);
- string customPath = (const char *)wxConvCurrent->cWX2MB(argv[foundParamIndIndex]);
+ string customPath = (const char*)WX2CHR(argv[foundParamIndIndex]);
vector<string> paramPartTokens;
Tokenize(customPath,paramPartTokens,"=");
if(paramPartTokens.size() >= 2 && paramPartTokens[1].length() > 0) {
@@ -2270,8 +2284,8 @@
}
else {
- printf("\nInvalid path specified on commandline [%s] value [%s]\n\n",(const char *)wxConvCurrent->cWX2MB(argv[foundParamIndIndex]),(paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
- printParameterHelp(wxConvCurrent->cWX2MB(argv[0]),false);
+ printf("\nInvalid path specified on commandline [%s] value [%s]\n\n",(const char*)WX2CHR(argv[foundParamIndIndex]),(paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
+ printParameterHelp(WX2CHR(argv[0]),false);
return false;
}
}
@@ -2287,7 +2301,7 @@
hasCommandArgument(argc, argv,(const char*)param,&foundParamIndIndex);
}
//printf("foundParamIndIndex = %d\n",foundParamIndIndex);
- string customPath = (const char *)wxConvCurrent->cWX2MB(argv[foundParamIndIndex]);
+ string customPath = (const char*)WX2CHR(argv[foundParamIndIndex]);
vector<string> paramPartTokens;
Tokenize(customPath,paramPartTokens,"=");
if(paramPartTokens.size() >= 2 && paramPartTokens[1].length() > 0) {
@@ -2299,8 +2313,8 @@
#endif
}
else {
- printf("\nInvalid path specified on commandline [%s] value [%s]\n\n",(const char *)wxConvCurrent->cWX2MB(argv[foundParamIndIndex]),(paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
- printParameterHelp(wxConvCurrent->cWX2MB(argv[0]),false);
+ printf("\nInvalid path specified on commandline [%s] value [%s]\n\n", (const char*)WX2CHR(argv[foundParamIndIndex]),(paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
+ printParameterHelp(WX2CHR(argv[0]),false);
return false;
}
}
@@ -2315,7 +2329,7 @@
hasCommandArgument(argc, argv,(const char*)param,&foundParamIndIndex);
}
//printf("foundParamIndIndex = %d\n",foundParamIndIndex);
- string customPath = (const char *)wxConvCurrent->cWX2MB(argv[foundParamIndIndex]);
+ string customPath = (const char*)WX2CHR(argv[foundParamIndIndex]);
vector<string> paramPartTokens;
Tokenize(customPath,paramPartTokens,"=");
if(paramPartTokens.size() >= 2 && paramPartTokens[1].length() > 0) {
@@ -2327,8 +2341,8 @@
#endif
}
else {
- printf("\nInvalid path specified on commandline [%s] value [%s]\n\n",(const char *)wxConvCurrent->cWX2MB(argv[foundParamIndIndex]),(paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
- printParameterHelp(wxConvCurrent->cWX2MB(argv[0]),false);
+ printf("\nInvalid path specified on commandline [%s] value [%s]\n\n", (const char*)WX2CHR(argv[foundParamIndIndex]),(paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
+ printParameterHelp(WX2CHR(argv[0]),false);
return false;
}
}
@@ -2343,7 +2357,7 @@
hasCommandArgument(argc, argv,(const char*)param,&foundParamIndIndex);
}
//printf("foundParamIndIndex = %d\n",foundParamIndIndex);
- string customPath = (const char *)wxConvCurrent->cWX2MB(argv[foundParamIndIndex]);
+ string customPath = (const char*)WX2CHR(argv[foundParamIndIndex]);
vector<string> paramPartTokens;
Tokenize(customPath,paramPartTokens,"=");
if(paramPartTokens.size() >= 2 && paramPartTokens[1].length() > 0) {
@@ -2355,8 +2369,8 @@
#endif
}
else {
- printf("\nInvalid path specified on commandline [%s] value [%s]\n\n",(const char *)wxConvCurrent->cWX2MB(argv[foundParamIndIndex]),(paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
- printParameterHelp(wxConvCurrent->cWX2MB(argv[0]),false);
+ printf("\nInvalid path specified on commandline [%s] value [%s]\n\n", (const char*)WX2CHR(argv[foundParamIndIndex]),(paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
+ printParameterHelp(WX2CHR(argv[0]),false);
return false;
}
}
@@ -2371,7 +2385,7 @@
hasCommandArgument(argc, argv,(const char*)param,&foundParamIndIndex);
}
//printf("foundParamIndIndex = %d\n",foundParamIndIndex);
- string value = (const char *)wxConvCurrent->cWX2MB(argv[foundParamIndIndex]);
+ string value = (const char*)WX2CHR(argv[foundParamIndIndex]);
vector<string> paramPartTokens;
Tokenize(value,paramPartTokens,"=");
if(paramPartTokens.size() >= 2 && paramPartTokens[1].length() > 0) {
@@ -2379,8 +2393,8 @@
printf("newAnimValue = %f\n",newAnimValue);
}
else {
- printf("\nInvalid path specified on commandline [%s] value [%s]\n\n",(const char *)wxConvCurrent->cWX2MB(argv[foundParamIndIndex]),(paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
- printParameterHelp(wxConvCurrent->cWX2MB(argv[0]),false);
+ printf("\nInvalid path specified on commandline [%s] value [%s]\n\n", (const char*)WX2CHR(argv[foundParamIndIndex]),(paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
+ printParameterHelp(WX2CHR(argv[0]),false);
return false;
}
}
@@ -2395,7 +2409,7 @@
hasCommandArgument(argc, argv,(const char*)param,&foundParamIndIndex);
}
//printf("foundParamIndIndex = %d\n",foundParamIndIndex);
- string value = (const char *)wxConvCurrent->cWX2MB(argv[foundParamIndIndex]);
+ string value = (const char*)WX2CHR(argv[foundParamIndIndex]);
vector<string> paramPartTokens;
Tokenize(value,paramPartTokens,"=");
if(paramPartTokens.size() >= 2 && paramPartTokens[1].length() > 0) {
@@ -2403,8 +2417,8 @@
//printf("newParticleLoopValue = %d\n",newParticleLoopValue);
}
else {
- printf("\nInvalid path specified on commandline [%s] value [%s]\n\n",(const char *)wxConvCurrent->cWX2MB(argv[foundParamIndIndex]),(paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
- printParameterHelp(wxConvCurrent->cWX2MB(argv[0]),false);
+ printf("\nInvalid path specified on commandline [%s] value [%s]\n\n", (const char*)WX2CHR(argv[foundParamIndIndex]),(paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
+ printParameterHelp(WX2CHR(argv[0]),false);
return false;
}
}
@@ -2419,7 +2433,7 @@
hasCommandArgument(argc, argv,(const char*)param,&foundParamIndIndex);
}
//printf("foundParamIndIndex = %d\n",foundParamIndIndex);
- string value = (const char *)wxConvCurrent->cWX2MB(argv[foundParamIndIndex]);
+ string value = (const char*)WX2CHR(argv[foundParamIndIndex]);
vector<string> paramPartTokens;
Tokenize(value,paramPartTokens,"=");
if(paramPartTokens.size() >= 2 && paramPartTokens[1].length() > 0) {
@@ -2427,8 +2441,8 @@
//printf("newAnimValue = %f\n",newAnimValue);
}
else {
- printf("\nInvalid path specified on commandline [%s] value [%s]\n\n",(const char *)wxConvCurrent->cWX2MB(argv[foundParamIndIndex]),(paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
- printParameterHelp(wxConvCurrent->cWX2MB(argv[0]),false);
+ printf("\nInvalid path specified on commandline [%s] value [%s]\n\n", (const char*)WX2CHR(argv[foundParamIndIndex]),(paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
+ printParameterHelp(WX2CHR(argv[0]),false);
return false;
}
}
@@ -2443,7 +2457,7 @@
hasCommandArgument(argc, argv,(const char*)param,&foundParamIndIndex);
}
//printf("foundParamIndIndex = %d\n",foundParamIndIndex);
- string value = (const char *)wxConvCurrent->cWX2MB(argv[foundParamIndIndex]);
+ string value = (const char*)WX2CHR(argv[foundParamIndIndex]);
vector<string> paramPartTokens;
Tokenize(value,paramPartTokens,"=");
if(paramPartTokens.size() >= 2 && paramPartTokens[1].length() > 0) {
@@ -2451,8 +2465,8 @@
//printf("newAnimValue = %f\n",newAnimValue);
}
else {
- printf("\nInvalid path specified on commandline [%s] value [%s]\n\n",(const char *)wxConvCurrent->cWX2MB(argv[foundParamIndIndex]),(paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
- printParameterHelp(wxConvCurrent->cWX2MB(argv[0]),false);
+ printf("\nInvalid path specified on commandline [%s] value [%s]\n\n", (const char*)WX2CHR(argv[foundParamIndIndex]),(paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
+ printParameterHelp(WX2CHR(argv[0]),false);
return false;
}
}
@@ -2467,7 +2481,7 @@
hasCommandArgument(argc, argv,(const char*)param,&foundParamIndIndex);
}
//printf("foundParamIndIndex = %d\n",foundParamIndIndex);
- string value = (const char *)wxConvCurrent->cWX2MB(argv[foundParamIndIndex]);
+ string value = static_cast<const char*>(WX2CHR(argv[foundParamIndIndex]));
vector<string> paramPartTokens;
Tokenize(value,paramPartTokens,"=");
if(paramPartTokens.size() >= 2 && paramPartTokens[1].length() > 0) {
@@ -2475,8 +2489,8 @@
//printf("newAnimValue = %f\n",newAnimValue);
}
else {
- printf("\nInvalid path specified on commandline [%s] value [%s]\n\n",(const char *)wxConvCurrent->cWX2MB(argv[foundParamIndIndex]),(paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
- printParameterHelp(wxConvCurrent->cWX2MB(argv[0]),false);
+ printf("\nInvalid path specified on commandline [%s] value [%s]\n\n", static_cast<const char*>(WX2CHR(argv[foundParamIndIndex])),(paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
+ printParameterHelp(WX2CHR(argv[0]),false);
return false;
}
}
@@ -2490,15 +2504,15 @@
hasCommandArgument(argc, argv,(const char*)param,&foundParamIndIndex);
}
//printf("foundParamIndIndex = %d\n",foundParamIndIndex);
- string value = (const char *)wxConvCurrent->cWX2MB(argv[foundParamIndIndex]);
+ string value = static_cast<const char*>(WX2CHR(argv[foundParamIndIndex]));
vector<string> paramPartTokens;
Tokenize(value,paramPartTokens,"=");
if(paramPartTokens.size() >= 2 && paramPartTokens[1].length() > 0) {
fileFormat = paramPartTokens[1];
}
else {
- printf("\nInvalid value specified on commandline [%s] value [%s]\n\n",(const char *)wxConvCurrent->cWX2MB(argv[foundParamIndIndex]),(paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
- printParameterHelp(wxConvCurrent->cWX2MB(argv[0]),false);
+ printf("\nInvalid value specified on commandline [%s] value [%s]\n\n", static_cast<const char*>(WX2CHR(argv[foundParamIndIndex])), (paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
+ printParameterHelp(WX2CHR(argv[0]),false);
return false;
}
}
@@ -2512,7 +2526,7 @@
auto_ptr<wchar_t> wstr(Ansi2WideString(modelPath.c_str()));
modelPath = utf8_encode(wstr.get());
#else
- modelPath = wxFNCONV(argv[1]);
+ modelPath = static_cast<const char*>(WX2CHR(argv[1]));
#endif
//#else
@@ -2542,7 +2556,7 @@
auto_ptr<wchar_t> wstr(Ansi2WideString(appPath.c_str()));
appPath = utf8_encode(wstr.get());
#else
- string appPath(wxFNCONV(exe_path));
+ string appPath(static_cast<const char*>(WX2CHR(exe_path)));
#endif
//#else
diff -Nur megaglest-3.13.0/source/glest_map_editor/main.cpp new/source/glest_map_editor/main.cpp
--- megaglest-3.13.0/source/glest_map_editor/main.cpp 2017-03-08 22:46:57.000000000 +0100
+++ new/source/glest_map_editor/main.cpp 2017-03-11 11:52:56.446433683 +0100
@@ -720,9 +720,9 @@
auto_ptr<wchar_t> wstr(Ansi2WideString(currentFile.c_str()));
currentFile = utf8_encode(wstr.get());
+#elif wxCHECK_VERSION(2, 9, 1)
+ currentFile = fileDialog->GetPath().ToStdString();
#else
- //currentFile = fileDialog->GetPath().ToAscii();
-
const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(fileDialog->GetPath());
currentFile = tmp_buf;
#endif
@@ -796,8 +796,9 @@
auto_ptr<wchar_t> wstr(Ansi2WideString(currentFile.c_str()));
currentFile = utf8_encode(wstr.get());
+#elif wxCHECK_VERSION(2, 9, 1)
+ currentFile = fileDialog->GetPath().ToStdString();
#else
- //currentFile = fd.GetPath().ToAscii();
const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(fd.GetPath());
currentFile = tmp_buf;
#endif
@@ -1655,8 +1656,12 @@
exit (0);
}
//#if defined(__MINGW32__)
+#if wxCHECK_VERSION(2, 9, 1)
+ fileparam = argv[1].ToStdString();
+#else
const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(argv[1]);
fileparam = tmp_buf;
+#endif
#ifdef WIN32
auto_ptr<wchar_t> wstr(Ansi2WideString(fileparam.c_str()));
@@ -1686,6 +1691,8 @@
auto_ptr<wchar_t> wstr(Ansi2WideString(appPath.c_str()));
appPath = utf8_encode(wstr.get());
+#elif wxCHECK_VERSION(2, 9, 1)
+ appPath = exe_path.ToStdString();
#else
appPath = wxFNCONV(exe_path);
#endif
View Git Blame Copy Permalink