From e8f590397138a82fb12245d08b545c8f25a7f277 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Wed, 4 Apr 2007 11:40:36 +0000
Subject: [PATCH] build fixes after previous commit

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/string.h   | 24 ++++++++++++++----------
 src/common/string.cpp | 22 +---------------------
 2 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/include/wx/string.h b/include/wx/string.h
index e598ccd5a1..5ec271239a 100644
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -399,18 +399,22 @@ private:
   // returns C string encoded as the implementation expects:
   #if wxUSE_UNICODE
   static const wchar_t* ImplStr(const wchar_t* str)
-    { return str; }
+    { return str ? str : wxT(""); }
   static const SubstrBufFromWC ImplStr(const wchar_t* str, size_t n)
-    { return SubstrBufFromWC(str, n == npos ? wxWcslen(str) : n); }
-  static wxWCharBuffer ImplStr(const char* str)
-    { return ConvertStr(str, npos, wxConvLibc).data; }
-  static SubstrBufFromMB ImplStr(const char* str, size_t n)
-    { return ConvertStr(str, n, wxConvLibc); }
+    { return SubstrBufFromWC(str, (str && n == npos) ? wxWcslen(str) : n); }
+  static wxWCharBuffer ImplStr(const char* str,
+                               const wxMBConv& conv = wxConvLibc)
+    { return ConvertStr(str, npos, conv).data; }
+  static SubstrBufFromMB ImplStr(const char* str, size_t n,
+                                 const wxMBConv& conv = wxConvLibc)
+    { return ConvertStr(str, n, conv); }
   #else
-  static const char* ImplStr(const char* str)
-    { return str; }
-  static const SubstrBufFromMB ImplStr(const char* str, size_t n)
-    { return SubstrBufFromMB(str, n == npos ? wxStrlen(str) : n); }
+  static const char* ImplStr(const char* str,
+                             const wxMBConv& WXUNUSED(conv) = wxConvLibc)
+    { return str ? str : ""; }
+  static const SubstrBufFromMB ImplStr(const char* str, size_t n,
+                                       const wxMBConv& WXUNUSED(conv) = wxConvLibc)
+    { return SubstrBufFromMB(str, (str && n == npos) ? wxStrlen(str) : n); }
   static wxCharBuffer ImplStr(const wchar_t* str)
     { return ConvertStr(str, npos, wxConvLibc).data; }
   static SubstrBufFromWC ImplStr(const wchar_t* str, size_t n)
diff --git a/src/common/string.cpp b/src/common/string.cpp
index 6cdcaef003..ae7d1af85c 100644
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -210,29 +210,9 @@ void wxString::UngetWriteBuf(size_t nLen)
 // all functions are inline in string.h
 
 // ---------------------------------------------------------------------------
-// assignment operators
+// concatenation operators
 // ---------------------------------------------------------------------------
 
-#if !wxUSE_UNICODE
-
-// same as 'signed char' variant
-wxString& wxString::operator=(const unsigned char* psz)
-{
-  *this = (const char *)psz;
-  return *this;
-}
-
-#if wxUSE_WCHAR_T
-wxString& wxString::operator=(const wchar_t *pwz)
-{
-  wxString str(pwz);
-  swap(str);
-  return *this;
-}
-#endif
-
-#endif
-
 /*
  * concatenation functions come in 5 flavours:
  *  string + string
-- 
2.47.2