- bugfixes for compiling on older wxwidgets and also for mingw
This commit is contained in:
parent
de5eb1e3c3
commit
1f433d6339
|
@ -366,7 +366,7 @@ void MainWindow::init(string fname) {
|
||||||
endPathWithSlash(userData);
|
endPathWithSlash(userData);
|
||||||
}
|
}
|
||||||
string defaultPath = userData + "maps/";
|
string defaultPath = userData + "maps/";
|
||||||
fileDialog->SetDirectory(wxString(defaultPath.c_str()));
|
fileDialog->SetDirectory(ToUnicode(defaultPath));
|
||||||
|
|
||||||
//printf("Default Path [%s]\n",defaultPath.c_str());
|
//printf("Default Path [%s]\n",defaultPath.c_str());
|
||||||
|
|
||||||
|
@ -610,7 +610,7 @@ void MainWindow::onMenuFileSaveAs(wxCommandEvent &event) {
|
||||||
wxFileDialog fd(this, wxT("Select file"), wxT(""), wxT(""), wxT("*.gbm|*.mgm"), wxSAVE);
|
wxFileDialog fd(this, wxT("Select file"), wxT(""), wxT(""), wxT("*.gbm|*.mgm"), wxSAVE);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if(fileDialog->GetPath() != "") {
|
if(fileDialog->GetPath() != ToUnicode("")) {
|
||||||
fd.SetPath(fileDialog->GetPath());
|
fd.SetPath(fileDialog->GetPath());
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -620,7 +620,7 @@ void MainWindow::onMenuFileSaveAs(wxCommandEvent &event) {
|
||||||
endPathWithSlash(userData);
|
endPathWithSlash(userData);
|
||||||
}
|
}
|
||||||
string defaultPath = userData + "maps/";
|
string defaultPath = userData + "maps/";
|
||||||
fd.SetDirectory(wxString(defaultPath.c_str()));
|
fd.SetDirectory(ToUnicode(defaultPath));
|
||||||
}
|
}
|
||||||
|
|
||||||
fd.SetWildcard(wxT("Glest Map (*.gbm)|*.gbm|MegaGlest Map (*.mgm)|*.mgm"));
|
fd.SetWildcard(wxT("Glest Map (*.gbm)|*.gbm|MegaGlest Map (*.mgm)|*.mgm"));
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
#include <shlwapi.h>
|
#include <shlwapi.h>
|
||||||
#include <Shlobj.h>
|
#include <shlobj.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "leak_dumper.h"
|
#include "leak_dumper.h"
|
||||||
|
|
Loading…
Reference in New Issue