change the selection appropriately (and refresh it as needed) after deleting a notebo...

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

diff --git a/include/wx/string.h b/include/wx/string.h
index af6c1ab17f76a2f55751fb60cdd3d5f63c5e86ed..b285cdefb63c1f6d938c32399b5b97cd98a5c809 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -165,14 +165,32 @@ inline int Stricmp(const char *psz1, const char *psz2)
 #endif  // OS/compiler
 }
 
+#ifndef wxSnprintf   
 // wxSnprintf() is like snprintf() if it's available and sprintf() (always
-// available, but dangerous!) if not
+// available, but dangerous!) if not.
 extern int WXDLLEXPORT wxSnprintf(wxChar *buf, size_t len,
-                                  const wxChar *format, ...);
+                                  const wxChar *format,
+                                  ...) ATTRIBUTE_PRINTF_3;
+#else
+// GNU libc 2.2 only has for wxSnprintf for Unicode called swprintf
+// so we imitate wxSprintf using it.
+extern int WXDLLEXPORT wxSprintf(wxChar *buf,
+                                  const wxChar *format,
+                                  ...) ATTRIBUTE_PRINTF_2;
+#endif
 
+#ifndef wxVsnprintf
 // and wxVsnprintf() is like vsnprintf() or vsprintf()
 extern int WXDLLEXPORT wxVsnprintf(wxChar *buf, size_t len,
-                                   const wxChar *format, va_list argptr);
+                                   const wxChar *format,
+                                   va_list argptr);
+#else
+// GNU libc 2.2 only has for wxVsnprintf for Unicode called vswprintf
+// so we imitate wxVsprintf using it.
+extern int WXDLLEXPORT wxVsprintf(wxChar *buf,
+                                  const wxChar *format,
+                                  va_list argptr);
+#endif
 
 // return an empty wxString
 class WXDLLEXPORT wxString; // not yet defined
@@ -462,6 +480,18 @@ public:
     // identical to c_str()
     const wxChar* GetData() const { return m_pchData; }
 
+    // conversion to plain ascii: this is usefull for
+    // converting numbers or strings which are certain
+    // not to contain special chars (typically system
+    // functions, X atoms, environment variables etc.)
+#if wxUSE_UNICODE
+    static wxString FromAscii( char *ascii );
+    const wxCharBuffer ToAscii() const;
+#else
+    static wxString FromAscii( char *ascii ) { return wxString( ascii ); }
+    const char *ToAscii() const { return m_pchData; }
+#endif
+
     // conversions with (possible) format convertions: have to return a
     // buffer with temporary data
     //
@@ -718,12 +748,13 @@ public:
 
   // formated input/output
     // as sprintf(), returns the number of characters written or < 0 on error
-  int Printf(const wxChar *pszFormat, ...);
+    // (take 'this' into account in attribute parameter count)
+  int Printf(const wxChar *pszFormat, ...) ATTRIBUTE_PRINTF_2;
     // as vprintf(), returns the number of characters written or < 0 on error
   int PrintfV(const wxChar* pszFormat, va_list argptr);
 
     // returns the string containing the result of Printf() to it
-  static wxString Format(const wxChar *pszFormat, ...);
+  static wxString Format(const wxChar *pszFormat, ...) ATTRIBUTE_PRINTF_1;
     // the same as above, but takes a va_list
   static wxString FormatV(const wxChar *pszFormat, va_list argptr);
 
@@ -751,8 +782,9 @@ public:
     // values for first parameter of Strip function
   enum stripType {leading = 0x1, trailing = 0x2, both = 0x3};
 
-    // use Printf()
-  int sprintf(const wxChar *pszFormat, ...);
+  // use Printf()
+  // (take 'this' into account in attribute parameter count)
+  int sprintf(const wxChar *pszFormat, ...) ATTRIBUTE_PRINTF_2;
 
     // use Cmp()
   inline int CompareTo(const wxChar* psz, caseCompare cmp = exact) const