added support for wxCAL_SHOW_WEEK_NUMBERS to generic version of wxCalendarCtrl (...

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

diff --git a/interface/wx/string.h b/interface/wx/string.h
index b42f6b8edd41d631742473079a3e85da94910aa8..80f58699d10f5ce944d1018cc5ed48426f73d117 100644 (file)
--- a/interface/wx/string.h
+++ b/interface/wx/string.h
@@ -539,7 +539,7 @@ public:
 
         @see FormatV(), Printf()
     */
 
         @see FormatV(), Printf()
     */

-    static wxString Format(const wxChar format, ...);
+    static wxString Format(const wxString& format, ...);

 
     /**
         This static function returns the string containing the result of calling
 
     /**
         This static function returns the string containing the result of calling


@@ -547,7 +547,7 @@ public:
 
         @see Format(), PrintfV()
     */
 
         @see Format(), PrintfV()
     */

-    static wxString FormatV(const wxChar format, va_list argptr);
+    static wxString FormatV(const wxString& format, va_list argptr);

 
     /**
         Returns the number of occurrences of @e ch in the string.
 
     /**
         Returns the number of occurrences of @e ch in the string.


@@ -1139,7 +1139,7 @@ public:
     //@{
     /**
         Assignment: the effect of each operation is the same as for the corresponding
     //@{
     /**
         Assignment: the effect of each operation is the same as for the corresponding

-        constructor (see @ref wxString() "wxString constructors").
+        constructor (see wxString constructors).

     */
     wxString operator =(const wxString& str);
     wxString operator =(wxUniChar c);
     */
     wxString operator =(const wxString& str);
     wxString operator =(wxUniChar c);


@@ -1369,10 +1369,6 @@ inline bool operator==(const wxString& s1, const wxCharBuffer& s2);
 inline bool operator==(const wxCharBuffer& s1, const wxString& s2);
 inline bool operator!=(const wxString& s1, const wxCharBuffer& s2);
 inline bool operator!=(const wxCharBuffer& s1, const wxString& s2);
 inline bool operator==(const wxCharBuffer& s1, const wxString& s2);
 inline bool operator!=(const wxString& s1, const wxCharBuffer& s2);
 inline bool operator!=(const wxCharBuffer& s1, const wxString& s2);

-inline wxString operator+(const wxString& string, const wxWCharBuffer& buf)
-inline wxString operator+(const wxWCharBuffer& buf, const wxString& string)
-inline wxString operator+(const wxString& string, const wxCharBuffer& buf)
-inline wxString operator+(const wxCharBuffer& buf, const wxString& string)

 
 /**
     Comparison operators with wxUniChar or wxUniCharRef.
 
 /**
     Comparison operators with wxUniChar or wxUniCharRef.