Derive from wxToggleButtonBase

[wxWidgets.git] / include / wx / string.h

diff --git a/include/wx/string.h b/include/wx/string.h
index f08d162cadd4e3fc146e7042b09047c6d2d4cc92..2d79486f836222ee9c9e1080d84986d5c5c3666e 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -934,7 +934,7 @@ public:
   wxString(const wxString& stringSrc) : m_impl(stringSrc.m_impl) { }
 
     // string containing nRepeat copies of ch
-  wxString(wxUniChar ch, size_t nRepeat = 1)
+  wxString(wxUniChar ch, size_t nRepeat = 1 )
     { assign(nRepeat, ch); }
   wxString(size_t nRepeat, wxUniChar ch)
     { assign(nRepeat, ch); }
@@ -1372,11 +1372,7 @@ public:
 #if wxUSE_WCHAR_T
     const wxWCharBuffer wc_str(const wxMBConv& conv = wxConvLibc) const;
 #endif // wxUSE_WCHAR_T
-#ifdef __WXOSX__
     const wxCharBuffer fn_str() const { return wxConvFile.cWC2WX( wc_str( wxConvLocal ) ); }
-#else
-    const wxChar* fn_str() const { return c_str(); }
-#endif
 #endif // Unicode/ANSI
 
   // overloaded assignment
@@ -1876,7 +1872,7 @@ public:
   wxString& append(const wxString& str, size_t pos, size_t n)
   {
     size_t from, len;
-    PosLenToImpl(pos, n, &from, &len);
+    str.PosLenToImpl(pos, n, &from, &len);
     m_impl.append(str.m_impl, from, len);
     return *this;
   }
@@ -1943,7 +1939,7 @@ public:
   wxString& assign(const wxString& str, size_t pos, size_t n)
   {
     size_t from, len;
-    PosLenToImpl(pos, n, &from, &len);
+    str.PosLenToImpl(pos, n, &from, &len);
     m_impl.assign(str.m_impl, from, len);
     return *this;
   }
@@ -2039,7 +2035,7 @@ public:
   wxString& insert(size_t nPos, const wxString& str, size_t nStart, size_t n)
   {
     size_t from, len;
-    PosLenToImpl(nStart, n, &from, &len);
+    str.PosLenToImpl(nStart, n, &from, &len);
     m_impl.insert(PosToImpl(nPos), str.m_impl, from, len);
     return *this;
   }
@@ -2169,7 +2165,7 @@ public:
     PosLenToImpl(nStart, nLen, &from, &len);
 
     size_t from2, len2;
-    PosLenToImpl(nStart2, nLen2, &from2, &len2);
+    str.PosLenToImpl(nStart2, nLen2, &from2, &len2);
 
     m_impl.replace(from, len, str.m_impl, from2, len2);
     return *this;