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.
This commit is contained in:
parent
c170f7f096
commit
d14aa9d8f0
1 changed files with 4 additions and 1 deletions
|
@ -48,8 +48,11 @@
|
||||||
// Define types used by Aegisub
|
// Define types used by Aegisub
|
||||||
namespace Aegisub {
|
namespace Aegisub {
|
||||||
// String type
|
// String type
|
||||||
|
#ifdef __WINDOWS__
|
||||||
typedef std::basic_string<wchar_t> String;
|
typedef std::basic_string<wchar_t> String;
|
||||||
|
#else
|
||||||
|
typedef wxString String;
|
||||||
|
#endif
|
||||||
// String array
|
// String array
|
||||||
typedef std::vector<String> StringArray;
|
typedef std::vector<String> StringArray;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue