X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04848a06cab4d88b9d199c10e68abe61fc962cc8..8b6cf9bf10a43343734d1bb22f2fae3ade2f4a67:/include/wx/string.h diff --git a/include/wx/string.h b/include/wx/string.h index b70306b886..c3cf3c9b03 100644 --- a/include/wx/string.h +++ b/include/wx/string.h @@ -934,7 +934,7 @@ public: wxString(const wxString& stringSrc) : m_impl(stringSrc.m_impl) { } // string containing nRepeat copies of ch - wxString(wxUniChar ch, size_t nRepeat = 1) + wxString(wxUniChar ch, size_t nRepeat = 1 ) { assign(nRepeat, ch); } wxString(size_t nRepeat, wxUniChar ch) { assign(nRepeat, ch); } @@ -1372,11 +1372,7 @@ public: #if wxUSE_WCHAR_T const wxWCharBuffer wc_str(const wxMBConv& conv = wxConvLibc) const; #endif // wxUSE_WCHAR_T -#ifdef __WXOSX__ - const wxCharBuffer fn_str() const { return wxConvFile.cWC2WX( wc_str( wxConvLocal ) ); } -#else - const wxChar* fn_str() const { return c_str(); } -#endif + const wxCharBuffer fn_str() const { return wxConvFile.cWC2WX( wc_str( wxConvLibc ) ); } #endif // Unicode/ANSI // overloaded assignment