added wxMBConv argument to char_str()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@45496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -587,7 +587,7 @@ to a function expecting non-const pointer.
|
|||||||
|
|
||||||
\membersection{wxString::char\_str}\label{wxstringcharstr}
|
\membersection{wxString::char\_str}\label{wxstringcharstr}
|
||||||
|
|
||||||
\constfunc{wxWritableCharBuffer}{char\_str}{\void}
|
\constfunc{wxWritableCharBuffer}{char\_str}{\param{wxMBConv\&}{ conv = wxConvLibc}}
|
||||||
|
|
||||||
Returns an object with string data that is implicitly convertible to
|
Returns an object with string data that is implicitly convertible to
|
||||||
{\tt char*} pointer. Note that any change to the returned buffer is lost and so
|
{\tt char*} pointer. Note that any change to the returned buffer is lost and so
|
||||||
|
@@ -839,7 +839,8 @@ public:
|
|||||||
// conversion to *non-const* multibyte or widestring buffer; modifying
|
// conversion to *non-const* multibyte or widestring buffer; modifying
|
||||||
// returned buffer won't affect the string, these methods are only useful
|
// returned buffer won't affect the string, these methods are only useful
|
||||||
// for passing values to const-incorrect functions
|
// for passing values to const-incorrect functions
|
||||||
wxWritableCharBuffer char_str() const { return mb_str(wxConvLibc); }
|
wxWritableCharBuffer char_str(const wxMBConv& conv = wxConvLibc) const
|
||||||
|
{ return mb_str(conv); }
|
||||||
#if wxUSE_WCHAR_T
|
#if wxUSE_WCHAR_T
|
||||||
wxWritableWCharBuffer wchar_str() const { return wc_str(wxConvLibc); }
|
wxWritableWCharBuffer wchar_str() const { return wc_str(wxConvLibc); }
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user