- more workarounds

[packages/wxWidgets.git] / wxWidgets-format.patch

--- wxWidgets-2.8.12/src/common/appbase.cpp.orig	2011-03-22 12:59:40.000000000 +0100
+++ wxWidgets-2.8.12/src/common/appbase.cpp	2012-09-30 08:02:00.981833952 +0200
@@ -424,7 +424,7 @@
         msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
                    lib.c_str(), progName.c_str(), prog.c_str());
 
-        wxLogFatalError(msg.c_str());
+        wxLogFatalError("%s", msg.c_str());
 
         // normally wxLogFatalError doesn't return
         return false;
--- wxWidgets-2.8.12/src/common/file.cpp.orig	2011-03-22 12:59:40.000000000 +0100
+++ wxWidgets-2.8.12/src/common/file.cpp	2012-09-30 08:19:02.785145988 +0200
@@ -513,7 +513,7 @@
     if ( chmod( (const char*) m_strTemp.fn_str(), mode) == -1 )
     {
 #ifndef __OS2__
-        wxLogSysError(_("Failed to set temporary file permissions"));
+        wxLogSysError("%s", _("Failed to set temporary file permissions"));
 #endif
     }
 #endif // Unix
--- wxWidgets-2.8.12/src/common/fileconf.cpp.orig	2011-03-22 12:59:41.000000000 +0100
+++ wxWidgets-2.8.12/src/common/fileconf.cpp	2012-09-30 08:20:45.761810510 +0200
@@ -508,7 +508,7 @@
 
             if ( err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF )
             {
-                wxLogError(_("Error reading config options."));
+                wxLogError("%s", _("Error reading config options."));
                 break;
             }
         }
@@ -1043,7 +1043,7 @@
 
   if ( !file.IsOpened() )
   {
-    wxLogError(_("can't open user configuration file."));
+    wxLogError("%s", _("can't open user configuration file."));
     return false;
   }
 
@@ -1057,13 +1057,13 @@
 
   if ( !file.Write(filetext, *m_conv) )
   {
-    wxLogError(_("can't write user configuration file."));
+    wxLogError("%s", _("can't write user configuration file."));
     return false;
   }
 
   if ( !file.Commit() )
   {
-      wxLogError(_("Failed to update user configuration file."));
+      wxLogError("%s", _("Failed to update user configuration file."));
 
       return false;
   }
@@ -1090,7 +1090,7 @@
         wxCharBuffer buf(line.mb_str(conv));
         if ( !os.Write(buf, strlen(buf)) )
         {
-            wxLogError(_("Error saving user configuration data."));
+            wxLogError("%s", _("Error saving user configuration data."));
 
             return false;
         }
--- wxWidgets-2.8.12/src/common/filename.cpp.orig	2011-03-22 12:59:41.000000000 +0100
+++ wxWidgets-2.8.12/src/common/filename.cpp	2012-09-30 08:26:13.781803673 +0200
@@ -859,7 +859,7 @@
 
     if ( path.empty() )
     {
-        wxLogSysError(_("Failed to create a temporary file name"));
+        wxLogSysError("%s", _("Failed to create a temporary file name"));
     }
     else
     {
@@ -894,7 +894,7 @@
             //        fails, though of course it should be protected against
             //        possible infinite looping too.
 
-            wxLogError(_("Failed to open temporary file."));
+            wxLogError("%s", _("Failed to open temporary file."));
 
             path.clear();
         }
--- wxWidgets-2.8.12/src/common/filefn.cpp.orig	2011-03-22 12:59:41.000000000 +0100
+++ wxWidgets-2.8.12/src/common/filefn.cpp	2012-09-30 09:03:28.965090416 +0200
@@ -1513,7 +1513,7 @@
 
     if ( !ok )
     {
-        wxLogSysError(_("Failed to get the working directory"));
+        wxLogSysError("%s", _("Failed to get the working directory"));
 
         // VZ: the old code used to return "." on error which didn't make any
         //     sense at all to me - empty string is a better error indicator