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 da539094757107b1238046365f6e2b3d0aee90e1..9b4741250bd5ea54bebb54d50d39ca6d5ee90362 100644 (file)
--- 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
   static wxString FromImpl(const wxStringImpl& src)
       { return wxString((CtorFromStringImplTag*)NULL, src); }
 #else

+  #if !wxUSE_STL_BASED_WXSTRING

   wxString(const wxStringImpl& src) : m_impl(src) { }
   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
 
   static wxString FromImpl(const wxStringImpl& src) { return wxString(src); }
 #endif