another fix to the wxFormatConverter bug with the formats which don't have to be...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index 4da43cbd344c4b4aedef911b68ce41ef07990fb0..c19ed120c72541a67c47724be584649a7f777447 100644 (file)
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -566,7 +566,10 @@ class wxFormatConverter
 public:
     wxFormatConverter(const wxChar *format);
 
 public:
     wxFormatConverter(const wxChar *format);
 

-    operator const wxChar *() const { return m_nCopied ? m_fmtOrig : m_fmt.c_str(); }
+    // notice that we only translated the string if m_fmtOrig == NULL (as set
+    // by CopyAllBefore()), otherwise we should simply use the original format
+    operator const wxChar *() const
+        { return m_fmtOrig ? m_fmtOrig : m_fmt.c_str(); }

 
 private:
     // copy another character to the translated format: this function does the
 
 private:
     // copy another character to the translated format: this function does the


@@ -577,7 +580,7 @@ private:
     {
         if ( !m_fmtOrig )
         {
     {
         if ( !m_fmtOrig )
         {

-            // we're translating, d copy
+            // we're translating, do copy

             m_fmt += ch;
         }
         else
             m_fmt += ch;
         }
         else