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

current locale in wxString means wxConvLibc

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2008-05-07 18:52:58 +00:00
parent ee0b7af01e
commit 8c1cd03078
2 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
interface/strconv.h
View File

@@ -83,8 +83,7 @@ public:
@library{wxbase} @library{wxbase}
@category{FIXME} @category{FIXME}
@see wxMBConvUTF8, wxMBConvUTF32, @ref overview_mbconv "wxMBConv classes @see wxMBConvUTF8, wxMBConvUTF32, @ref overview_mbconv "wxMBConv classes overview"
overview"
*/ */
class wxMBConvUTF16 : public wxMBConv class wxMBConvUTF16 : public wxMBConv
{ {
@@ -115,8 +114,7 @@ public:
@library{wxbase} @library{wxbase}
@category{FIXME} @category{FIXME}
@see wxMBConv, wxEncodingConverter, @ref overview_mbconv "wxMBConv @see wxMBConv, wxEncodingConverter, @ref overview_mbconv "wxMBConv classes overview"
classes overview"
*/ */
class wxCSConv : public wxMBConv class wxCSConv : public wxMBConv
{ {
@@ -232,8 +230,7 @@ public:
@library{wxbase} @library{wxbase}
@category{FIXME} @category{FIXME}
@see wxMBConvUTF8, wxMBConvUTF16, @ref overview_mbconv "wxMBConv classes @see wxMBConvUTF8, wxMBConvUTF16, @ref overview_mbconv "wxMBConv classes overview"
overview"
*/ */
class wxMBConvUTF32 : public wxMBConv class wxMBConvUTF32 : public wxMBConv
{ {
@@ -271,8 +268,7 @@ public:
@library{wxbase} @library{wxbase}
@category{FIXME} @category{FIXME}
@see wxCSConv, wxEncodingConverter, @ref overview_mbconv "wxMBConv @see wxCSConv, wxEncodingConverter, @ref overview_mbconv "wxMBConv classes overview"
classes overview"
*/ */
class wxMBConv class wxMBConv
{ {

22
interface/string.h
View File

@@ -109,15 +109,15 @@ public:
wxString uses the current locale encoding to convert any C string wxString uses the current locale encoding to convert any C string
literal to Unicode. The same is done for converting to and from literal to Unicode. The same is done for converting to and from
@c std::string and for the return value of c_str(). For this @c std::string and for the return value of c_str(). For this
conversion, the @a wxConvLocal class instance is used. See wxCSConv. conversion, the @a wxConvLibc class instance is used. See wxCSConv and wxMBConv.
wxString implements most of the methods of the @c std::string class. wxString implements most of the methods of the @c std::string class.
These standard functions are only listed here, but there are not These standard functions are only listed here, but they are not
fully documented in this manual. Please see the STL documentation. fully documented in this manual. Please see the STL documentation.
The behaviour of all these functions is identical to the behaviour The behaviour of all these functions is identical to the behaviour
described there. described there.
You may notice that wxString sometimes has many functions which do You may notice that wxString sometimes has several functions which do
the same thing like, for example, Length(), Len() and length() which the same thing like, for example, Length(), Len() and length() which
all return the string length. In all cases of such duplication the all return the string length. In all cases of such duplication the
@c std::string compatible method should be used. @c std::string compatible method should be used.
@@ -310,7 +310,7 @@ public:
/** /**
Constructs a string from the string literal @c psz using Constructs a string from the string literal @c psz using
the current locale encoding to convert it to Unicode. the current locale encoding to convert it to Unicode (wxConvLibc).
*/ */
wxString(const char *psz); wxString(const char *psz);
@@ -322,7 +322,7 @@ public:
/** /**
Constructs a string from the first @ nLength character of the string literal @c psz using Constructs a string from the first @ nLength character of the string literal @c psz using
the current locale encoding to convert it to Unicode. the current locale encoding to convert it to Unicode (wxConvLibc).
*/ */
wxString(const char *psz, size_t nLength); wxString(const char *psz, size_t nLength);
@@ -354,8 +354,8 @@ public:
wxString(const wxWCharBuffer& buf); wxString(const wxWCharBuffer& buf);
/** /**
Constructs a string from @str using the using Constructs a string from @str using the using the current locale encoding
the current locale encoding to convert it to Unicode. to convert it to Unicode (wxConvLibc).
*/ */
wxString(const std::string& str); wxString(const std::string& str);
@@ -855,7 +855,7 @@ public:
@see wxString::From8BitData() @see wxString::From8BitData()
*/ */
const char* To8BitData() const; const char* To8BitData() const;
const const wxCharBuffer To8BitData() const; const wxCharBuffer To8BitData() const;
//@} //@}
//@{ //@{
@@ -867,7 +867,7 @@ public:
powerful means of converting wxString to C string. powerful means of converting wxString to C string.
*/ */
const char* ToAscii() const; const char* ToAscii() const;
const const wxCharBuffer ToAscii() const; const wxCharBuffer ToAscii() const;
//@} //@}
/** /**
@@ -937,7 +937,7 @@ public:
Same as utf8_str(). Same as utf8_str().
*/ */
const char* ToUTF8() const; const char* ToUTF8() const;
const const wxCharBuffer ToUF8() const; const wxCharBuffer ToUF8() const;
//@} //@}
/** /**
@@ -1024,7 +1024,7 @@ public:
@see wxMBConv, c_str(), wc_str(), fn_str(), char_str() @see wxMBConv, c_str(), wc_str(), fn_str(), char_str()
*/ */
const char* mb_str(const wxMBConv& conv = wxConvLibc) const; const char* mb_str(const wxMBConv& conv = wxConvLibc) const;
const const wxCharBuffer mb_str(const wxMBConv& conv = wxConvLibc) const; const wxCharBuffer mb_str(const wxMBConv& conv = wxConvLibc) const;
//@} //@}
/** /**