From d70fb7fe2d0fded5ae76fbf5a2cdb25255cffbd5 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Thu, 15 Sep 2011 06:03:13 +0000
Subject: [PATCH] Fix compilation errors

Originally committed to SVN as r5601.
---
 aegisub/src/ass_entry.h             | 2 +-
 aegisub/src/auto4_lua_assfile.cpp   | 2 +-
 aegisub/src/dialog_selection.cpp    | 3 ++-
 aegisub/src/dialog_shift_times.cpp  | 1 +
 aegisub/src/dialog_spellchecker.cpp | 3 +++
 aegisub/src/include/aegisub/menu.h  | 2 ++
 aegisub/src/menu.cpp                | 5 +++++
 7 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/aegisub/src/ass_entry.h b/aegisub/src/ass_entry.h
index b9568a31f..35066a30e 100644
--- a/aegisub/src/ass_entry.h
+++ b/aegisub/src/ass_entry.h
@@ -93,7 +93,7 @@ namespace Aegisub {
 		///
 		const char *GetName() { return "internal_error/invalid_margin_id"; }
 	};
-};
+}
 
 
 
diff --git a/aegisub/src/auto4_lua_assfile.cpp b/aegisub/src/auto4_lua_assfile.cpp
index 7bd4992ee..17b6151c7 100644
--- a/aegisub/src/auto4_lua_assfile.cpp
+++ b/aegisub/src/auto4_lua_assfile.cpp
@@ -1015,7 +1015,7 @@ namespace Automation4 {
 			description = wxString(lua_tostring(L, 1), wxConvUTF8);
 			lua_pop(L, 1);
 		}
-		laf->ass->Commit(description);
+		laf->ass->Commit(description, AssFile::COMMIT_NEW);
 
 		return 0;
 	}
diff --git a/aegisub/src/dialog_selection.cpp b/aegisub/src/dialog_selection.cpp
index bb1342213..b77c46339 100644
--- a/aegisub/src/dialog_selection.cpp
+++ b/aegisub/src/dialog_selection.cpp
@@ -28,6 +28,7 @@
 #ifndef AGI_PRE
 #include <wx/checkbox.h>
 #include <wx/combobox.h>
+#include <wx/msgdlg.h>
 #include <wx/radiobox.h>
 #include <wx/radiobut.h>
 #include <wx/regex.h>
@@ -80,7 +81,7 @@ std::tr1::function<bool (wxString)> get_predicate(int mode, wxRegEx *re, bool ma
 
 	switch (mode) {
 		case MODE_REGEXP:
-			return bind(&wxRegEx::Matches, re, _1, 0);
+			return bind(static_cast<bool (wxRegEx::*)(wxString const&,int) const>(&wxRegEx::Matches), re, _1, 0);
 		case MODE_EXACT:
 			if (match_case)
 				return bind(std::equal_to<wxString>(), match_text, _1);
diff --git a/aegisub/src/dialog_shift_times.cpp b/aegisub/src/dialog_shift_times.cpp
index 2f456794e..be4ee5e6b 100644
--- a/aegisub/src/dialog_shift_times.cpp
+++ b/aegisub/src/dialog_shift_times.cpp
@@ -34,6 +34,7 @@
 #include <wx/listbox.h>
 #include <wx/radiobox.h>
 #include <wx/radiobut.h>
+#include <wx/sizer.h>
 #include <wx/textctrl.h>
 #endif
 
diff --git a/aegisub/src/dialog_spellchecker.cpp b/aegisub/src/dialog_spellchecker.cpp
index cdd1fd153..a5c9af3bd 100644
--- a/aegisub/src/dialog_spellchecker.cpp
+++ b/aegisub/src/dialog_spellchecker.cpp
@@ -27,6 +27,9 @@
 #include <wx/combobox.h>
 #include <wx/intl.h>
 #include <wx/listbox.h>
+#include <wx/msgdlg.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
 #include <wx/textctrl.h>
 #endif
 
diff --git a/aegisub/src/include/aegisub/menu.h b/aegisub/src/include/aegisub/menu.h
index 4cb362b9b..0760819ea 100644
--- a/aegisub/src/include/aegisub/menu.h
+++ b/aegisub/src/include/aegisub/menu.h
@@ -26,8 +26,10 @@
 
 namespace agi { struct Context; }
 
+class wxFrame;
 class wxMenu;
 class wxMenuBar;
+class wxWindow;
 
 namespace menu {
 	DEFINE_BASE_EXCEPTION_NOINNER(Error, agi::Exception)
diff --git a/aegisub/src/menu.cpp b/aegisub/src/menu.cpp
index 4801924bb..7ecbcfd60 100644
--- a/aegisub/src/menu.cpp
+++ b/aegisub/src/menu.cpp
@@ -39,6 +39,9 @@
 #include <vector>
 
 #include <wx/app.h>
+#include <wx/filename.h>
+#include <wx/frame.h>
+#include <wx/menu.h>
 #include <wx/menuitem.h>
 #endif
 
@@ -301,6 +304,8 @@ void process_menu_item(wxMenu *parent, agi::Context *c, json::Object const& ele,
 			else if (special == "options")
 				wxApp::s_macPreferencesMenuItemId = id;
 		}
+#else
+		(void)id;
 #endif
 	}
 	catch (agi::Exception const& e) {