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

Minor corrections

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2008-07-07 20:21:38 +00:00
parent b22bb1a015
commit c73f1b33e8
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
interface/wx/string.h
View File

@@ -74,14 +74,16 @@ public:
use reference counting. By default, wxString uses @c std::string use reference counting. By default, wxString uses @c std::string
internally even if wxUSE_STL is not defined. internally even if wxUSE_STL is not defined.
wxWidgets 3.0 wxString internally uses UCS-2 (basically 2-byte per Since wxWidgets 3.0 wxString internally uses UCS-2 (basically 2-byte per
character wchar_t) under Windows and UTF-8 under Unix, Linux and character wchar_t and nearly the same as UTF-16) under Windows and
OS X to store its content. Much work has been done to make existing UTF-8 under Unix, Linux and OS X to store its content.
code using ANSI string literals work as before. If you need to have a Much work has been done to make existing code using ANSI string literals
wxString that uses wchar_t on Unix and Linux, too, you can specify work as before. If you need to have a wxString that uses wchar_t on Unix
this on the command line with the @c configure @c --disable-utf8 switch. and Linux, too, you can specify this on the command line with the
As a consequence of this change, iterating over a wxString by index @c configure @c --disable-utf8 switch.
can become inefficient in UTF8 mode and iterators should be used instead:
Since iterating over a wxString by index can become inefficient in UTF-8
mode and iterators should be used instead of index based access:
@code @code
wxString s = "hello"; wxString s = "hello";
@@ -150,7 +152,7 @@ public:
done in release builds. done in release builds.
This section also contains both implicit and explicit conversions to C style This section also contains both implicit and explicit conversions to C style
strings. Although implicit conversion is quite convenient, you are advised strings. Although implicit conversion is quite convenient, you are advised
to use explicit wc_str() method for the sake of clarity. to use wc_str() for the sake of clarity.
@li GetChar() @li GetChar()
@li GetWritableChar() @li GetWritableChar()
@@ -953,7 +955,7 @@ public:
Same as utf8_str(). Same as utf8_str().
*/ */
const char* ToUTF8() const; const char* ToUTF8() const;
const wxCharBuffer ToUF8() const; const wxCharBuffer ToUTF8() const;
//@} //@}
/** /**
@@ -1167,7 +1169,7 @@ public:
The macro wxWX2WCbuf is defined as the correct return The macro wxWX2WCbuf is defined as the correct return
type (without const). type (without const).
@see uf8_str(), c_str(), mb_str(), fn_str(), wchar_str() @see utf8_str(), c_str(), mb_str(), fn_str(), wchar_str()
*/ */
const wchar_t* wc_str() const; const wchar_t* wc_str() const;
const wxWCharBuffer wc_str() const; const wxWCharBuffer wc_str() const;