From a1ae731f2ccdb1e9963db237e148e92ed569a1b2 Mon Sep 17 00:00:00 2001
From: WrinklyNinja <wrinklyninja1@gmail.com>
Date: Wed, 17 Jul 2013 20:48:01 +0100
Subject: [PATCH] Fixes to eliminate wxWidgets 2.9.5 and Boost.Log compiler
 errors.

---
 src/backend/parsers.h | 5 ++++-
 src/gui/ids.h         | 2 --
 src/gui/main.cpp      | 5 ++++-
 src/gui/main.h        | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/backend/parsers.h b/src/backend/parsers.h
index fcd0c1fe..6e7e07a3 100644
--- a/src/backend/parsers.h
+++ b/src/backend/parsers.h
@@ -28,6 +28,10 @@
 #define BOOST_SPIRIT_UNICODE
 #endif
 
+#ifndef BOOST_SPIRIT_USE_PHOENIX_V3
+#define BOOST_SPIRIT_USE_PHOENIX_V3 1
+#endif
+
 #include "metadata.h"
 #include "helpers.h"
 #include "error.h"
@@ -43,7 +47,6 @@
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/phoenix_core.hpp>
 #include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/home/phoenix/object/construct.hpp>
 #include <boost/spirit/include/phoenix_bind.hpp>
 
 namespace YAML {
diff --git a/src/gui/ids.h b/src/gui/ids.h
index dbb29e56..d27fe974 100644
--- a/src/gui/ids.h
+++ b/src/gui/ids.h
@@ -28,8 +28,6 @@
 #include <boost/format.hpp>
 #include "wx/wxprec.h"
 
-#include "../backend/error.h"  //Something in wxWidgets has a #define that conflicts with the error codes.
-
 #ifndef WX_PRECOMP
 #       include "wx/wx.h"
 #endif
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index c1bcb393..a4b81d7b 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -47,6 +47,9 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/format.hpp>
 #include <boost/locale.hpp>
+#include <boost/log/core.hpp>
+#include <boost/log/trivial.hpp>
+#include <boost/log/expressions.hpp>
 
 #include <wx/snglinst.h>
 #include <wx/aboutdlg.h>
@@ -834,7 +837,7 @@ void Launcher::OnAbout(wxCommandEvent& event) {
     wxAboutBox(aboutInfo);
 }
 
-LoadOrderPreview::LoadOrderPreview(wxWindow *parent, const wxChar *title, const std::list<boss::Plugin>& plugins) : wxDialog(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER), _plugins(plugins) {
+LoadOrderPreview::LoadOrderPreview(wxWindow *parent, const wxString title, const std::list<boss::Plugin>& plugins) : wxDialog(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER), _plugins(plugins) {
 
     //Init controls.
     _loadOrder = new wxListView(this, LIST_LoadOrder, wxDefaultPosition, wxDefaultSize, wxLC_REPORT);
diff --git a/src/gui/main.h b/src/gui/main.h
index 807e2ac4..0bc3dabd 100644
--- a/src/gui/main.h
+++ b/src/gui/main.h
@@ -69,7 +69,7 @@ private:
 
 class LoadOrderPreview : public wxDialog {
 public:
-    LoadOrderPreview(wxWindow *parent, const wxChar *title, const std::list<boss::Plugin>& plugins);
+    LoadOrderPreview(wxWindow *parent, const wxString title, const std::list<boss::Plugin>& plugins);
 
     void OnMoveUp(wxCommandEvent& event);
     void OnMoveDown(wxCommandEvent& event);