From: Vadim Zeitlin Date: Sun, 6 Dec 2009 02:29:56 +0000 (+0000) Subject: Minor corrections to ToWChar() comment. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/961326054fcf39eaa56137aa034d4614ead64dd2?ds=inline Minor corrections to ToWChar() comment. Don't refer to the non-existent outputBuf parameter and don't imply that the value of dstLen matters to decide whether we really convert or not -- only whether dst pointer itself is NULL or not does. See #11486. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/strconv.h b/include/wx/strconv.h index 87911259a3..0847360a8f 100644 --- a/include/wx/strconv.h +++ b/include/wx/strconv.h @@ -61,19 +61,21 @@ public: // there is not enough space for everything, including the trailing NUL // character(s), in the output buffer, wxCONV_FAILED is returned. // - // In the special case when dstLen is 0 (outputBuf may be NULL then) the - // return value is the length of the needed buffer but nothing happens - // otherwise. If srcLen is wxNO_LEN, the entire string, up to and + // In the special case when dst is NULL (the value of dstLen is ignored + // then) the return value is the length of the needed buffer but nothing + // happens otherwise. If srcLen is wxNO_LEN, the entire string, up to and // including the trailing NUL(s), is converted, otherwise exactly srcLen // bytes are. // // Typical usage: // // size_t dstLen = conv.ToWChar(NULL, 0, src); - // if ( dstLen != wxCONV_FAILED ) + // if ( dstLen == wxCONV_FAILED ) // ... handle error ... // wchar_t *wbuf = new wchar_t[dstLen]; // conv.ToWChar(wbuf, dstLen, src); + // ... work with wbuf ... + // delete [] wbuf; // virtual size_t ToWChar(wchar_t *dst, size_t dstLen, const char *src, size_t srcLen = wxNO_LEN) const;