Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radically simplified declarations of wxUString-specific char buffers: there are no compatibility concerns, so they can simply be typedefs for wxCharTypeBuffer<T>

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2008-08-10 20:28:20 +00:00
parent 5c1de526d2
commit 95691abd43
1 changed files with 6 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
include/wx/ustring.h
View File

@@ -1,4 +1,4 @@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/ustring.h // Name: wx/ustring.h
// Purpose: 32-bit string (UCS-4) // Purpose: 32-bit string (UCS-4)
// Author: Robert Roebling // 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
typedef wxCharTypeBuffer<wxChar16> wxU16CharBuffer;
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) {}
};
#endif #endif
#if SIZEOF_WCHAR_T == 4
#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
typedef wxWCharBuffer wxU32CharBuffer; typedef wxWCharBuffer wxU32CharBuffer;
#else
typedef wxCharTypeBuffer<wxChar32> wxU32CharBuffer;
#endif #endif
class WXDLLIMPEXP_BASE wxUString: public std::basic_string<wxChar32> class WXDLLIMPEXP_BASE wxUString: public std::basic_string<wxChar32>
{ {
public: public: