From 13bfeda7cf8f70ba4c837b4b45017688a99b01e2 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Mon, 1 Oct 2012 19:44:15 +0200 Subject: [PATCH] - simplified --- wxWidgets-format.patch | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/wxWidgets-format.patch b/wxWidgets-format.patch index 2b26685..d330775 100644 --- a/wxWidgets-format.patch +++ b/wxWidgets-format.patch @@ -1,11 +1,19 @@ ---- 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()); - +--- wxWidgets-2.8.12/src/common/appbase.cpp.orig 2012-10-01 19:41:54.219157836 +0200 ++++ wxWidgets-2.8.12/src/common/appbase.cpp 2012-10-01 19:43:44.765822198 +0200 +@@ -416,15 +416,7 @@ + + if ( strcmp(optionsSignature, WX_BUILD_OPTIONS_SIGNATURE) != 0 ) + { +- wxString lib = wxString::FromAscii(WX_BUILD_OPTIONS_SIGNATURE); +- wxString prog = wxString::FromAscii(optionsSignature); +- wxString progName = wxString::FromAscii(componentName); +- wxString msg; +- +- 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()); ++ wxLogFatalError("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s.", WX_BUILD_OPTIONS_SIGNATURE, optionsSignature, componentName); // normally wxLogFatalError doesn't return return false; -- 2.44.0