From: Václav Slavík Date: Mon, 30 Jul 2007 10:51:35 +0000 (+0000) Subject: don't crash in wxGetEmptyString(): it's now a #define for wxString(), which is not... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a0f63de9411b6911d287ce1431cc1b0cd3040c6e don't crash in wxGetEmptyString(): it's now a #define for wxString(), which is not any less efficient now git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47826 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/string.h b/include/wx/string.h index b6002fd5aa..cc791c7d7f 100644 --- a/include/wx/string.h +++ b/include/wx/string.h @@ -2689,16 +2689,7 @@ inline wxString operator+(wchar_t ch, const wxString& string) { return wxUniChar(ch) + string; } -#if wxUSE_STL_BASED_WXSTRING - // return an empty wxString (not very useful with wxUSE_STL == 1) - inline const wxString wxGetEmptyString() { return wxString(); } -#else // !wxUSE_STL_BASED_WXSTRING - // return an empty wxString (more efficient than wxString() here) - inline const wxString& wxGetEmptyString() - { - return *(wxString *)&wxEmptyString; - } -#endif // wxUSE_STL_BASED_WXSTRING/!wxUSE_STL_BASED_WXSTRING +#define wxGetEmptyString() wxString() // ---------------------------------------------------------------------------- // wxStringBuffer: a tiny class allowing to get a writable pointer into string