From 7deca9f43c0ae81f2407bd657dd9b901777d9f4d Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Sun, 26 May 2013 15:53:37 -0700
Subject: [PATCH] Update to latest wx trunk

---
 aegisub/build/wx/setup-build.h | 2 ++
 deps/wxWidgets                 | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/aegisub/build/wx/setup-build.h b/aegisub/build/wx/setup-build.h
index 25fa97556..b41411b02 100644
--- a/aegisub/build/wx/setup-build.h
+++ b/aegisub/build/wx/setup-build.h
@@ -1,6 +1,8 @@
 #ifndef _WX_SETUP_H_
 #define _WX_SETUP_H_
+#ifndef wxUSE_GUI
 #define wxUSE_GUI 1
+#endif
 #define WXWIN_COMPATIBILITY_2_4 0
 #define WXWIN_COMPATIBILITY_2_6 0
 #define WXWIN_COMPATIBILITY_2_8 0
diff --git a/deps/wxWidgets b/deps/wxWidgets
index 91270d2d1..4c86168d9 160000
--- a/deps/wxWidgets
+++ b/deps/wxWidgets
@@ -1 +1 @@
-Subproject commit 91270d2d17374f24a4de5108ea1a332190b827a6
+Subproject commit 4c86168d9aaa36cffc74afbc6abd1ff5b270db64