build fixes after previous commit

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

diff --git a/include/wx/string.h b/include/wx/string.h
index e598ccd5a149bc7a17f6ca25191c1e1a3384981f..5ec271239ac2471c6d97d9dfb361be4722f631c8 100644 (file)
--- 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)
   // 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)
   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
   #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)
   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 6cdcaef00353117df4ec4fd16b7951cb32c02700..ae7d1af85cbcf371256f63083134664e4d3f1d20 100644 (file)
--- 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
 
 // ---------------------------------------------------------------------------
 // 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
 /*
  * concatenation functions come in 5 flavours:
  *  string + string