From 1f433d633988069003adf68ad0aeab09f7ea397a Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Tue, 5 Apr 2011 07:08:29 +0000
Subject: [PATCH] - bugfixes for compiling on older wxwidgets and also for
 mingw

---
 source/glest_map_editor/main.cpp              | 6 +++---
 source/shared_lib/sources/util/properties.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/glest_map_editor/main.cpp b/source/glest_map_editor/main.cpp
index 17068b6b..92f731a4 100755
--- a/source/glest_map_editor/main.cpp
+++ b/source/glest_map_editor/main.cpp
@@ -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"));
diff --git a/source/shared_lib/sources/util/properties.cpp b/source/shared_lib/sources/util/properties.cpp
index 5a333f09..a41440a7 100644
--- a/source/shared_lib/sources/util/properties.cpp
+++ b/source/shared_lib/sources/util/properties.cpp
@@ -21,7 +21,7 @@
 
 #ifdef WIN32
 #include <shlwapi.h>
-#include <Shlobj.h>
+#include <shlobj.h>
 #endif
 
 #include "leak_dumper.h"