commented out more unused code (bcc compilation warning)

[wxWidgets.git] / src / common / string.cpp

diff --git a/src/common/string.cpp b/src/common/string.cpp
index f222417109a9b6f1ca427b7723965283195f376d..8f20b9ac13d3a347fae78413cab446ac81078d71 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -1706,6 +1706,26 @@ bool wxString::ToULong(unsigned long *val, int base) const
     return wxStringToIntType(c_str(), val, base, wxStrtoul);
 }
 
     return wxStringToIntType(c_str(), val, base, wxStrtoul);
 }
 

+bool wxString::ToLongLong(wxLongLong_t *val, int base) const
+{
+#ifdef wxHAS_STRTOLL
+    return wxStringToIntType(c_str(), val, base, wxStrtoll);
+#else
+    // TODO: implement this ourselves
+    return false;
+#endif // wxHAS_STRTOLL
+}
+
+bool wxString::ToULongLong(wxULongLong_t *val, int base) const
+{
+#ifdef wxHAS_STRTOLL
+    return wxStringToIntType(c_str(), val, base, wxStrtoull);
+#else
+    // TODO: implement this ourselves
+    return false;
+#endif
+}
+

 bool wxString::ToDouble(double *val) const
 {
     wxCHECK_MSG( val, false, _T("NULL pointer in wxString::ToDouble") );
 bool wxString::ToDouble(double *val) const
 {
     wxCHECK_MSG( val, false, _T("NULL pointer in wxString::ToDouble") );


@@ -1795,9 +1815,11 @@ int wxString::PrintfV(const wxChar* pszFormat, va_list argptr)
             // current size of the buffer
             size *= 2;
         }
             // current size of the buffer
             size *= 2;
         }

-        else if ( len > size )
+        else if ( len >= size )

         {
         {

-            size = len;
+            // some vsnprintf() implementations NUL-terminate the buffer and
+            // some don't in len == size case, to be safe always add 1
+            size = len + 1;

         }
         else // ok, there was enough space
         {
         }
         else // ok, there was enough space
         {