From: Václav Slavík <vslavik@fastmail.fm>
Date: Thu, 19 Apr 2007 10:57:35 +0000 (+0000)
Subject: fixed compilation of STL non-UTF8 builds
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/82a99c692ccec70172d65b6e04c1ad9730ead888

fixed compilation of STL non-UTF8 builds


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/string.h b/include/wx/string.h
index da53909475..9b4741250b 100644
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -787,7 +787,10 @@ private:
   static wxString FromImpl(const wxStringImpl& src)
       { return wxString((CtorFromStringImplTag*)NULL, src); }
 #else
+  #if !wxUSE_STL_BASED_WXSTRING
   wxString(const wxStringImpl& src) : m_impl(src) { }
+  // else: already defined as wxString(wxStdString) below
+  #endif
   static wxString FromImpl(const wxStringImpl& src) { return wxString(src); }
 #endif