SCROLLWIN instead of SCROLL again

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

diff --git a/include/wx/string.h b/include/wx/string.h
index 5d605f2e765d3ea09aed3b3d5afeb8505b1177aa..1b0c138ea923d5d4a9958c548a04d6486f2357fc 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -95,7 +95,7 @@
 // ----------------------------------------------------------------------------
 
 #if defined(__VISAGECPP__) && __IBMCPP__ >= 400
 // ----------------------------------------------------------------------------
 
 #if defined(__VISAGECPP__) && __IBMCPP__ >= 400

-// must define this in .cpp for VA or else you get multiply defined symbols everywhere
+// must define this static for VA or else you get multiply defined symbols everywhere

 extern const unsigned int wxSTRING_MAXLEN;
 
 #else
 extern const unsigned int wxSTRING_MAXLEN;
 
 #else


@@ -520,6 +520,8 @@ public:
     // append count copies of given character
   wxString& Append(wxChar ch, size_t count = 1u)
     { wxString str(ch, count); return *this << str; }
     // append count copies of given character
   wxString& Append(wxChar ch, size_t count = 1u)
     { wxString str(ch, count); return *this << str; }

+  wxString& Append(const wxChar* psz, size_t nLen)
+    { ConcatSelf(nLen, psz); return *this; }

 
     // prepend a string, return the string itself
   wxString& Prepend(const wxString& str)
 
     // prepend a string, return the string itself
   wxString& Prepend(const wxString& str)


@@ -668,6 +670,7 @@ public:
   wxChar *GetWriteBuf(size_t nLen);
     // call this immediately after GetWriteBuf() has been used
   void UngetWriteBuf();
   wxChar *GetWriteBuf(size_t nLen);
     // call this immediately after GetWriteBuf() has been used
   void UngetWriteBuf();

+  void UngetWriteBuf(size_t nLen);

 
   // wxWindows version 1 compatibility functions
 
 
   // wxWindows version 1 compatibility functions