fixed compilation of STL non-UTF8 builds

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-19 10:57:35 +00:00
parent 467175ab3f
commit 82a99c692c
1 changed files with 3 additions and 0 deletions
--- 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