Do not use Tooltips if they are disabled

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

diff --git a/src/common/strvararg.cpp b/src/common/strvararg.cpp
index e89bdf35b593a78c80ec5a95ccf6a3776a20c961..e71c060b109706a03fd1f260dd36b38c6ce1120f 100644 (file)
--- a/src/common/strvararg.cpp
+++ b/src/common/strvararg.cpp
@@ -152,7 +152,7 @@ public:
         m_nCopied = 0;
     }
 
         m_nCopied = 0;
     }
 

-    wxCharTypeBuffer<CharType> Convert(const CharType *format)
+    wxScopedCharTypeBuffer<CharType> Convert(const CharType *format)

     {
         // this is reset to NULL if we modify the format string
         m_fmtOrig = format;
     {
         // this is reset to NULL if we modify the format string
         m_fmtOrig = format;


@@ -263,12 +263,14 @@ public:
         // format
         if ( m_fmtOrig )
         {
         // format
         if ( m_fmtOrig )
         {

-            return wxCharTypeBuffer<CharType>::CreateNonOwned(m_fmtOrig);
+            return wxScopedCharTypeBuffer<CharType>::CreateNonOwned(m_fmtOrig);

         }
         else
         {
         }
         else
         {

-            // NULL-terminate converted format string:
-            *m_fmtLast = 0;
+            // shrink converted format string to actual size (instead of
+            // over-sized allocation from CopyAllBefore()) and NUL-terminate
+            // it:
+            m_fmt.shrink(m_fmtLast - m_fmt.data());

             return m_fmt;
         }
     }
             return m_fmt;
         }
     }