X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dcb68102796280b3e54979ae95738089914ce842..a66dece0c5379f15263807f9c89b375cc60c6a31:/include/wx/string.h diff --git a/include/wx/string.h b/include/wx/string.h index f2ba5dfa68..a31f122bcc 100644 --- a/include/wx/string.h +++ b/include/wx/string.h @@ -51,6 +51,10 @@ #include // for strcasecmp() #endif // HAVE_STRCASECMP_IN_STRINGS_H +#ifdef __PALMOS__ + #include +#endif + #include "wx/wxchar.h" // for wxChar #include "wx/buffer.h" // for wxCharBuffer #include "wx/strconv.h" // for wxConvertXXX() macros and wxMBConv classes @@ -82,7 +86,7 @@ extern const unsigned int wxSTRING_MAXLEN; #else // maximum possible length for a string means "take all string" everywhere -// (as sizeof(StringData) is unknown here, we substract 100) +// (as sizeof(StringData) is unknown here, we subtract 100) const unsigned int wxSTRING_MAXLEN = UINT_MAX - 100; #endif @@ -819,8 +823,7 @@ public: // type differs because a function may either return pointer to the buffer // directly or have to use intermediate buffer for translation. #if wxUSE_UNICODE - const wxCharBuffer mb_str(wxMBConv& conv = wxConvLibc) const - { return conv.cWC2MB(c_str()); } + const wxCharBuffer mb_str(wxMBConv& conv = wxConvLibc) const; const wxWX2MBbuf mbc_str() const { return mb_str(*wxConvCurrent); } @@ -843,8 +846,7 @@ public: const wxWX2MBbuf mbc_str() const { return mb_str(); } #if wxUSE_WCHAR_T - const wxWCharBuffer wc_str(wxMBConv& conv) const - { return conv.cMB2WC(c_str()); } + const wxWCharBuffer wc_str(wxMBConv& conv) const; #endif // wxUSE_WCHAR_T const wxChar* fn_str() const { return c_str(); }