radically simplified declarations of wxUString-specific char buffers: there are no...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/ustring.h b/include/wx/ustring.h
index 1fdfa105a4ac2ed639f88dad2b8a570d155f7f72..ebf8e43536fb90d8d9b4b368349e450218f41694 100644 (file)
--- a/include/wx/ustring.h
+++ b/include/wx/ustring.h
@@ -1,4 +1,4 @@
-/////////////////////////////////////////////////////////////////////////////
+

 // Name:        wx/ustring.h
 // Purpose:     32-bit string (UCS-4)
 // Author:      Robert Roebling
 // Name:        wx/ustring.h
 // Purpose:     32-bit string (UCS-4)
 // Author:      Robert Roebling


@@ -15,50 +15,19 @@
 
 #include <string>
 
 
 #include <string>
 

-WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxCharTypeBuffer<wxChar32> )
-

 #if SIZEOF_WCHAR_T == 2
 #if SIZEOF_WCHAR_T == 2

-

 typedef wxWCharBuffer wxU16CharBuffer;
 typedef wxWCharBuffer wxU16CharBuffer;

-

 #else
 #else

-
-class WXDLLIMPEXP_BASE wxU16CharBuffer : public wxCharTypeBuffer<wxChar16>
-{
-public:
-    typedef wxCharTypeBuffer<wxChar16> wxCharTypeBufferBase;
-
-    wxU16CharBuffer(const wxCharTypeBufferBase& buf)
-        : wxCharTypeBufferBase(buf) {}
-
-    wxU16CharBuffer(const CharType *str = NULL) : wxCharTypeBufferBase(str) {}
-    wxU16CharBuffer(size_t len) : wxCharTypeBufferBase(len) {}
-};
-
+typedef wxCharTypeBuffer<wxChar16> wxU16CharBuffer;

 #endif
 
 #endif
 

-
-
-#if SIZEOF_WCHAR_T == 2
-
-class WXDLLIMPEXP_BASE wxU32CharBuffer : public wxCharTypeBuffer<wxChar32>
-{
-public:
-    typedef wxCharTypeBuffer<wxChar32> wxCharTypeBufferBase;
-
-    wxU32CharBuffer(const wxCharTypeBufferBase& buf)
-        : wxCharTypeBufferBase(buf) {}
-
-    wxU32CharBuffer(const CharType *str = NULL) : wxCharTypeBufferBase(str) {}
-    wxU32CharBuffer(size_t len) : wxCharTypeBufferBase(len) {}
-};
-
-#else
-
+#if SIZEOF_WCHAR_T == 4

 typedef wxWCharBuffer wxU32CharBuffer;
 typedef wxWCharBuffer wxU32CharBuffer;

-
+#else
+typedef wxCharTypeBuffer<wxChar32> wxU32CharBuffer;

 #endif
 
 #endif
 

+

 class WXDLLIMPEXP_BASE wxUString: public std::basic_string<wxChar32>
 {
 public: 
 class WXDLLIMPEXP_BASE wxUString: public std::basic_string<wxChar32>
 {
 public: