Fixed MinGW/ANSI (and probably any other C++ compiler, excluding, of course,

MSVC 5, with which I tested my changes) breakage.

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

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index 65309fdef08964a9001c58af23d70d1fc86e0c76..f36473d75c57e0607af80e4e23f51daacbaadfd0 100644 (file)
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -303,7 +303,8 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
                             ::sprintf(szScratch, s_szFlags, val);
                         }
                         {
                             ::sprintf(szScratch, s_szFlags, val);
                         }
                         {

-                            wxMB2WXbuf tmp = wxConvLibc.cMB2WX(szScratch);
+                            const wxMB2WXbuf tmp =
+                                wxConvLibc.cMB2WX(szScratch);

                             APPEND_STR(tmp);
                         }
 
                             APPEND_STR(tmp);
                         }
 


@@ -326,7 +327,8 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
                             ::sprintf(szScratch, s_szFlags, val);
                         }
                         {
                             ::sprintf(szScratch, s_szFlags, val);
                         }
                         {

-                            wxMB2WXbuf tmp = wxConvLibc.cMB2WX(szScratch);
+                            const wxMB2WXbuf tmp =
+                                wxConvLibc.cMB2WX(szScratch);

                             APPEND_STR(tmp);
                         }
 
                             APPEND_STR(tmp);
                         }
 


@@ -341,7 +343,8 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
                             s_szFlags[flagofs] = '\0';
                             ::sprintf(szScratch, s_szFlags, val);
 
                             s_szFlags[flagofs] = '\0';
                             ::sprintf(szScratch, s_szFlags, val);
 

-                            wxMB2WXbuf tmp = wxConvLibc.cMB2WX(szScratch);
+                            const wxMB2WXbuf tmp =
+                                wxConvLibc.cMB2WX(szScratch);

                             APPEND_STR(tmp);
 
                             done = TRUE;
                             APPEND_STR(tmp);
 
                             done = TRUE;