Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- bugfixes for compiling on older wxwidgets and also for mingw

This commit is contained in:
Mark Vejvoda 2011-04-05 07:08:29 +00:00
parent de5eb1e3c3
commit 1f433d6339
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/glest_map_editor/main.cpp
View File

@ -366,7 +366,7 @@ void MainWindow::init(string fname) {
endPathWithSlash(userData);
}
string defaultPath = userData + "maps/";
fileDialog->SetDirectory(wxString(defaultPath.c_str()));
fileDialog->SetDirectory(ToUnicode(defaultPath));
//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);
#endif
if(fileDialog->GetPath() != "") {
if(fileDialog->GetPath() != ToUnicode("")) {
fd.SetPath(fileDialog->GetPath());
}
else {
@ -620,7 +620,7 @@ void MainWindow::onMenuFileSaveAs(wxCommandEvent &event) {
endPathWithSlash(userData);
}
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"));

2
source/shared_lib/sources/util/properties.cpp
View File

@ -21,7 +21,7 @@
#ifdef WIN32
#include <shlwapi.h>
#include <Shlobj.h>
#include <shlobj.h>
#endif
#include "leak_dumper.h"