X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a6d14383a57771a334f6d0b6376dd47bf24049d..1bda83992364d46ff77228a849808eb546fbfaa5:/src/common/ustring.cpp

diff --git a/src/common/ustring.cpp b/src/common/ustring.cpp
index cb7eb084c4..c0cae8f58d 100644
--- a/src/common/ustring.cpp
+++ b/src/common/ustring.cpp
@@ -15,16 +15,13 @@
     #pragma hdrstop
 #endif
 
+#include "wx/ustring.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/strconv.h"  // wxConvLibc
+    #include "wx/crt.h"
     #include "wx/log.h"
 #endif
 
-#include "wx/ustring.h"
-#include "wx/unichar.h"
-#include "wx/string.h"
-
-
 wxUString &wxUString::assignFromAscii( const char *str )
 {
    size_type len = wxStrlen( str );
@@ -545,4 +542,16 @@ wxU16CharBuffer wxUString::utf16_str() const
     
     return result;    
 }
-    
+
+
+#if SIZEOF_WCHAR_T != 2
+template<>
+wxCharTypeBuffer<wxChar16>::Data
+wxCharTypeBuffer<wxChar16>::NullData(NULL);
+#endif
+
+#if SIZEOF_WCHAR_T != 4
+template<>
+wxCharTypeBuffer<wxChar32>::Data
+wxCharTypeBuffer<wxChar32>::NullData(NULL);
+#endif