From d14aa9d8f08f416c976b4efbcfcbf073f6af9862 Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Thu, 23 Jul 2009 06:00:23 +0000
Subject: [PATCH] typedef String to wxString until we decide upon the removal
 of Aegisub::String. (i hope so!), this fixes wx2.8 and wx2.9 when using
 wc_str().

Originally committed to SVN as r3215.
---
 aegisub/src/include/aegisub/aegisub.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/aegisub/src/include/aegisub/aegisub.h b/aegisub/src/include/aegisub/aegisub.h
index 385b68901..f10cf7de2 100644
--- a/aegisub/src/include/aegisub/aegisub.h
+++ b/aegisub/src/include/aegisub/aegisub.h
@@ -48,8 +48,11 @@
 // Define types used by Aegisub
 namespace Aegisub {
 	// String type
+#ifdef __WINDOWS__
 	typedef std::basic_string<wchar_t> String;
-
+#else
+	typedef wxString String;
+#endif
 	// String array
 	typedef std::vector<String> StringArray;