1 --- wxWidgets-2.8.12/src/common/appbase.cpp.orig 2011-03-22 12:59:40.000000000 +0100
2 +++ wxWidgets-2.8.12/src/common/appbase.cpp 2012-09-30 08:02:00.981833952 +0200
4 msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
5 lib.c_str(), progName.c_str(), prog.c_str());
7 - wxLogFatalError(msg.c_str());
8 + wxLogFatalError("%s", msg.c_str());
10 // normally wxLogFatalError doesn't return
12 --- wxWidgets-2.8.12/src/common/fs_mem.cpp.orig 2011-03-22 12:59:41.000000000 +0100
13 +++ wxWidgets-2.8.12/src/common/fs_mem.cpp 2012-09-30 10:11:49.745004943 +0200
16 if (m_Hash -> Get(filename) != NULL)
19 - s.Printf(_("Memory VFS already contains file '%s'!"), filename.c_str());
21 + wxLogError(_("Memory VFS already contains file '%s'!"), filename.c_str());
27 m_Hash -> Get(filename) == NULL)
30 - s.Printf(_("Trying to remove file '%s' from memory VFS, but it is not loaded!"), filename.c_str());
32 + wxLogError(_("Trying to remove file '%s' from memory VFS, but it is not loaded!"), filename.c_str());
38 s.Printf(_("Failed to store image '%s' to memory VFS!"), filename.c_str());
39 wxPrintf(wxT("'%s'\n"), s.c_str());
41 + wxLogError("%s", s.c_str());
45 --- wxWidgets-2.8.12/utils/wxrc/wxrc.cpp.orig 2011-03-22 13:00:31.000000000 +0100
46 +++ wxWidgets-2.8.12/utils/wxrc/wxrc.cpp 2012-10-01 19:13:05.222527207 +0200
48 for (size_t i = 0; i < parFiles.Count(); i++)
51 - wxPrintf(wxT("processing ") + parFiles[i] + wxT("...\n"));
52 + wxPrintf("processing %s...\n", parFiles[i].c_str());
56 if (!doc.Load(parFiles[i]))
58 - wxLogError(wxT("Error parsing file ") + parFiles[i]);
59 + wxLogError("Error parsing file %s", parFiles[i].c_str());
64 fullname = inputPath + wxFILE_SEP_PATH + n->GetContent();
67 - wxPrintf(wxT("adding ") + fullname + wxT("...\n"));
68 + wxPrintf("adding %s...\n", fullname.c_str());
70 wxString filename = GetInternalFileName(n->GetContent(), flist);
71 n->SetContent(filename);
76 - wxPrintf(wxT("compressing ") + parOutput + wxT("...\n"));
77 + wxPrintf("compressing %s...\n", parOutput.c_str());
79 wxString cwd = wxGetCwd();
80 wxSetWorkingDirectory(parOutputPath);
85 - wxPrintf(wxT("creating C++ source file ") + parOutput + wxT("...\n"));
86 + wxPrintf("creating C++ source file %s...\n", parOutput.c_str());
94 - wxPrintf(wxT("creating Python source file ") + parOutput + wxT("...\n"));
95 + wxPrintf("creating Python source file %s...\n", parOutput.c_str());
100 for (size_t i = 0; i < parFiles.Count(); i++)
103 - wxPrintf(wxT("processing ") + parFiles[i] + wxT("...\n"));
104 + wxPrintf("processing %s...", parFiles[i].c_str());
107 if (!doc.Load(parFiles[i]))
109 - wxLogError(wxT("Error parsing file ") + parFiles[i]);
110 + wxLogError("Error parsing file %s", parFiles[i].c_str());
114 --- wxWidgets-2.8.12/src/common/file.cpp.orig 2011-03-22 12:59:40.000000000 +0100
115 +++ wxWidgets-2.8.12/src/common/file.cpp 2012-09-30 08:19:02.785145988 +0200
117 if ( chmod( (const char*) m_strTemp.fn_str(), mode) == -1 )
120 - wxLogSysError(_("Failed to set temporary file permissions"));
121 + wxLogSysError("%s", _("Failed to set temporary file permissions"));
125 --- wxWidgets-2.8.12/src/common/fileconf.cpp.orig 2011-03-22 12:59:41.000000000 +0100
126 +++ wxWidgets-2.8.12/src/common/fileconf.cpp 2012-09-30 08:20:45.761810510 +0200
129 if ( err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF )
131 - wxLogError(_("Error reading config options."));
132 + wxLogError("%s", _("Error reading config options."));
136 @@ -1043,7 +1043,7 @@
138 if ( !file.IsOpened() )
140 - wxLogError(_("can't open user configuration file."));
141 + wxLogError("%s", _("can't open user configuration file."));
145 @@ -1057,13 +1057,13 @@
147 if ( !file.Write(filetext, *m_conv) )
149 - wxLogError(_("can't write user configuration file."));
150 + wxLogError("%s", _("can't write user configuration file."));
154 if ( !file.Commit() )
156 - wxLogError(_("Failed to update user configuration file."));
157 + wxLogError("%s", _("Failed to update user configuration file."));
161 @@ -1090,7 +1090,7 @@
162 wxCharBuffer buf(line.mb_str(conv));
163 if ( !os.Write(buf, strlen(buf)) )
165 - wxLogError(_("Error saving user configuration data."));
166 + wxLogError("%s", _("Error saving user configuration data."));
170 --- wxWidgets-2.8.12/src/common/filename.cpp.orig 2011-03-22 12:59:41.000000000 +0100
171 +++ wxWidgets-2.8.12/src/common/filename.cpp 2012-09-30 08:26:13.781803673 +0200
176 - wxLogSysError(_("Failed to create a temporary file name"));
177 + wxLogSysError("%s", _("Failed to create a temporary file name"));
182 // fails, though of course it should be protected against
183 // possible infinite looping too.
185 - wxLogError(_("Failed to open temporary file."));
186 + wxLogError("%s", _("Failed to open temporary file."));
190 --- wxWidgets-2.8.12/src/common/filefn.cpp.orig 2011-03-22 12:59:41.000000000 +0100
191 +++ wxWidgets-2.8.12/src/common/filefn.cpp 2012-09-30 09:03:28.965090416 +0200
192 @@ -1513,7 +1513,7 @@
196 - wxLogSysError(_("Failed to get the working directory"));
197 + wxLogSysError("%s", _("Failed to get the working directory"));
199 // VZ: the old code used to return "." on error which didn't make any
200 // sense at all to me - empty string is a better error indicator
201 --- wxWidgets-2.8.12/src/common/init.cpp.orig 2011-03-22 12:59:41.000000000 +0100
202 +++ wxWidgets-2.8.12/src/common/init.cpp 2012-09-30 09:06:52.951752832 +0200
205 if ( !wxModule::InitializeModules() )
207 - wxLogError(_("Initialization failed in post init, aborting."));
208 + wxLogError("%s", _("Initialization failed in post init, aborting."));
212 --- wxWidgets-2.8.12/src/common/stopwatch.cpp.orig 2011-03-22 12:59:42.000000000 +0100
213 +++ wxWidgets-2.8.12/src/common/stopwatch.cpp 2012-09-30 09:13:41.768410978 +0200
215 if (( t0 != (time_t)-1 ) && ( t1 != (time_t)-1 ))
216 return (long)difftime(t1, t0) + (60 * 60 * 24 * 4);
218 - wxLogSysError(_("Failed to get the local system time"));
219 + wxLogSysError("%s", _("Failed to get the local system time"));
227 - wxLogError(_("wxGetTimeOfDay failed."));
228 + wxLogError("%s", _("wxGetTimeOfDay failed."));
231 #elif defined(HAVE_FTIME)
232 --- wxWidgets-2.8.12/src/common/tarstrm.cpp.orig 2011-03-22 12:59:42.000000000 +0100
233 +++ wxWidgets-2.8.12/src/common/tarstrm.cpp 2012-09-30 09:40:58.075043539 +0200
236 m_hdr->Read(*m_parent_i_stream);
237 if (m_parent_i_stream->Eof())
238 - wxLogError(_("incomplete header block in tar"));
239 + wxLogError("%s", _("incomplete header block in tar"));
240 if (!*m_parent_i_stream)
241 return wxSTREAM_READ_ERROR;
242 m_offset += TAR_BLOCKSIZE;
244 if (m_sumType == SUM_SIGNED)
245 ok = chksum == m_hdr->Sum(true);
247 - wxLogError(_("checksum failure reading tar header block"));
248 + wxLogError("%s", _("checksum failure reading tar header block"));
249 return wxSTREAM_READ_ERROR;
255 if (!ok || recPos < len || size != lastread) {
256 - wxLogWarning(_("invalid data in extended tar header"));
257 + wxLogWarning("%s", _("invalid data in extended tar header"));
262 wxFileOffset wxTarInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
265 - wxLogError(_("tar entry not open"));
266 + wxLogError("%s", _("tar entry not open"));
267 m_lasterror = wxSTREAM_READ_ERROR;
270 @@ -1018,7 +1018,7 @@
271 size_t wxTarInputStream::OnSysRead(void *buffer, size_t size)
274 - wxLogError(_("tar entry not open"));
275 + wxLogError("%s", _("tar entry not open"));
276 m_lasterror = wxSTREAM_READ_ERROR;
278 if (!IsOk() || !size)
279 @@ -1037,7 +1037,7 @@
280 } else if (!m_parent_i_stream->IsOk()) {
281 // any other error will have been reported by the underlying stream
282 if (m_parent_i_stream->Eof())
283 - wxLogError(_("unexpected end of file"));
284 + wxLogError("%s", _("unexpected end of file"));
285 m_lasterror = wxSTREAM_READ_ERROR;
288 @@ -1371,7 +1371,7 @@
291 if (sizePos == wxInvalidOffset || !m_hdr->SetOctal(TAR_SIZE, m_pos)) {
292 - wxLogError(_("incorrect size given for tar entry"));
293 + wxLogError("%s", _("incorrect size given for tar entry"));
294 m_lasterror = wxSTREAM_WRITE_ERROR;
297 @@ -1492,7 +1492,7 @@
298 wxFileOffset wxTarOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
301 - wxLogError(_("tar entry not open"));
302 + wxLogError("%s", _("tar entry not open"));
303 m_lasterror = wxSTREAM_WRITE_ERROR;
305 if (!IsOk() || m_datapos == wxInvalidOffset)
306 @@ -1514,7 +1514,7 @@
307 size_t wxTarOutputStream::OnSysWrite(const void *buffer, size_t size)
310 - wxLogError(_("tar entry not open"));
311 + wxLogError("%s", _("tar entry not open"));
312 m_lasterror = wxSTREAM_WRITE_ERROR;
314 if (!IsOk() || !size)
315 --- wxWidgets-2.8.12/src/common/zstream.cpp.orig 2011-03-22 12:59:43.000000000 +0100
316 +++ wxWidgets-2.8.12/src/common/zstream.cpp 2012-09-30 09:47:40.141701824 +0200
321 - wxLogError(_("Gzip not supported by this version of zlib"));
322 + wxLogError("%s", _("Gzip not supported by this version of zlib"));
323 m_lasterror = wxSTREAM_READ_ERROR;
330 - wxLogError(_("Can't initialize zlib inflate stream."));
331 + wxLogError("%s", _("Can't initialize zlib inflate stream."));
332 m_lasterror = wxSTREAM_READ_ERROR;
336 m_lasterror = wxSTREAM_EOF;
339 - wxLogError(_("Can't read inflate stream: unexpected EOF in underlying stream."));
340 + wxLogError("%s", _("Can't read inflate stream: unexpected EOF in underlying stream."));
346 // if gzip is asked for but not supported...
347 if (flags == wxZLIB_GZIP && !CanHandleGZip()) {
348 - wxLogError(_("Gzip not supported by this version of zlib"));
349 + wxLogError("%s", _("Gzip not supported by this version of zlib"));
350 m_lasterror = wxSTREAM_WRITE_ERROR;
357 - wxLogError(_("Can't initialize zlib deflate stream."));
358 + wxLogError("%s", _("Can't initialize zlib deflate stream."));
359 m_lasterror = wxSTREAM_WRITE_ERROR;
362 --- wxWidgets-2.8.12/src/common/zipstrm.cpp.orig 2011-03-22 12:59:42.000000000 +0100
363 +++ wxWidgets-2.8.12/src/common/zipstrm.cpp 2012-09-30 09:49:19.005033098 +0200
365 m_parent_o_stream = &stream;
367 if (deflateReset(m_deflate) != Z_OK) {
368 - wxLogError(_("can't re-initialize zlib deflate stream"));
369 + wxLogError("%s", _("can't re-initialize zlib deflate stream"));
370 m_lasterror = wxSTREAM_WRITE_ERROR;
374 m_parent_i_stream = &stream;
376 if (inflateReset(m_inflate) != Z_OK) {
377 - wxLogError(_("can't re-initialize zlib inflate stream"));
378 + wxLogError("%s", _("can't re-initialize zlib inflate stream"));
379 m_lasterror = wxSTREAM_READ_ERROR;
382 @@ -1269,7 +1269,7 @@
384 if (m_DiskNumber != 0 || m_StartDisk != 0 ||
385 m_EntriesHere != m_TotalEntries)
386 - wxLogWarning(_("assuming this is a multi-part zip concatenated"));
387 + wxLogWarning("%s", _("assuming this is a multi-part zip concatenated"));
391 @@ -1441,7 +1441,7 @@
392 // failed, so either this is a non-seekable stream (ok), or not a zip
393 if (m_parentSeekable) {
394 m_lasterror = wxSTREAM_READ_ERROR;
395 - wxLogError(_("invalid zip file"));
396 + wxLogError("%s", _("invalid zip file"));
400 @@ -1484,7 +1484,7 @@
404 - wxLogError(_("can't find central directory in zip"));
405 + wxLogError("%s", _("can't find central directory in zip"));
406 m_lasterror = wxSTREAM_READ_ERROR;
409 @@ -1570,7 +1570,7 @@
412 if (m_signature != CENTRAL_MAGIC) {
413 - wxLogError(_("error reading zip central directory"));
414 + wxLogError("%s", _("error reading zip central directory"));
415 return wxSTREAM_READ_ERROR;
418 @@ -1661,7 +1661,7 @@
422 - wxLogError(_("error reading zip local header"));
423 + wxLogError("%s", _("error reading zip local header"));
424 return wxSTREAM_READ_ERROR;
427 @@ -1709,7 +1709,7 @@
430 if (ReadSignature() != LOCAL_MAGIC) {
431 - wxLogError(_("bad zipfile offset to entry"));
432 + wxLogError("%s", _("bad zipfile offset to entry"));
436 @@ -1776,7 +1776,7 @@
437 switch (m_entry.GetMethod()) {
438 case wxZIP_METHOD_STORE:
439 if (m_entry.GetSize() == wxInvalidOffset) {
440 - wxLogError(_("stored file length not in Zip header"));
441 + wxLogError("%s", _("stored file length not in Zip header"));
444 m_store->Open(m_entry.GetSize());
445 @@ -1790,7 +1790,7 @@
449 - wxLogError(_("unsupported Zip compression method"));
450 + wxLogError("%s", _("unsupported Zip compression method"));
454 @@ -2171,7 +2171,7 @@
458 - wxLogError(_("unsupported Zip compression method"));
459 + wxLogError("%s", _("unsupported Zip compression method"));
463 --- wxWidgets-2.8.12/include/wx/unix/pipe.h.orig 2011-03-22 13:01:28.000000000 +0100
464 +++ wxWidgets-2.8.12/include/wx/unix/pipe.h 2012-09-30 09:52:41.701695539 +0200
467 if ( pipe(m_fds) == -1 )
469 - wxLogSysError(_("Pipe creation failed"));
470 + wxLogSysError("%s", _("Pipe creation failed"));
474 --- wxWidgets-2.8.12/src/unix/baseunix.cpp.orig 2011-03-22 13:01:28.000000000 +0100
475 +++ wxWidgets-2.8.12/src/unix/baseunix.cpp 2012-09-30 09:53:20.938361388 +0200
478 if ( waitpid(execData.pid, &exitcode, 0) == -1 || !WIFEXITED(exitcode) )
480 - wxLogSysError(_("Waiting for subprocess termination failed"));
481 + wxLogSysError("%s", _("Waiting for subprocess termination failed"));
485 --- wxWidgets-2.8.12/src/unix/snglinst.cpp.orig 2011-03-22 13:01:28.000000000 +0100
486 +++ wxWidgets-2.8.12/src/unix/snglinst.cpp 2012-09-30 10:01:41.101684296 +0200
488 // another process managed to open and lock the file and terminate
489 // (erasing it) before we got here, but this should happen so
490 // rarely in practice that we don't care
491 - wxLogError(_("Failed to access lock file."));
492 + wxLogError("%s", _("Failed to access lock file."));
497 ssize_t count = file.Read(buf, WXSIZEOF(buf));
498 if ( count == wxInvalidOffset )
500 - wxLogError(_("Failed to read PID from lock file."));
501 + wxLogError("%s", _("Failed to read PID from lock file."));
505 --- wxWidgets-2.8.12/src/unix/threadpsx.cpp.orig 2011-03-22 13:01:28.000000000 +0100
506 +++ wxWidgets-2.8.12/src/unix/threadpsx.cpp 2012-09-30 10:06:25.185011707 +0200
508 int rc = pthread_setspecific(gs_keySelf, thread);
511 - wxLogSysError(rc, _("Cannot start thread: error writing TLS"));
512 + wxLogSysError(rc, "%s", _("Cannot start thread: error writing TLS"));
517 // wxLogDebug: it is possible to bring the system to its knees
518 // by creating too many threads and not joining them quite
520 - wxLogError(_("Failed to join a thread, potential memory leak detected - please restart the program"));
521 + wxLogError("%s", _("Failed to join a thread, potential memory leak detected - please restart the program"));
524 m_shouldBeJoined = false;
525 @@ -1106,7 +1106,7 @@
527 if ( pthread_attr_getschedpolicy(&attr, &policy) != 0 )
529 - wxLogError(_("Cannot retrieve thread scheduling policy."));
530 + wxLogError("%s", _("Cannot retrieve thread scheduling policy."));
534 @@ -1133,7 +1133,7 @@
535 if ( prio != WXTHREAD_DEFAULT_PRIORITY )
537 // notify the programmer that this doesn't work here
538 - wxLogWarning(_("Thread priority setting is ignored."));
539 + wxLogWarning("%s", _("Thread priority setting is ignored."));
541 //else: we have default priority, so don't complain
543 @@ -1433,7 +1433,7 @@
544 if ( pthread_cancel(m_internal->GetId()) != 0 )
545 #endif // HAVE_PTHREAD_CANCEL
547 - wxLogError(_("Failed to terminate a thread."));
548 + wxLogError("%s", _("Failed to terminate a thread."));
550 return wxTHREAD_MISC_ERROR;
552 @@ -1615,7 +1615,7 @@
553 int rc = pthread_key_create(&gs_keySelf, NULL /* dtor function */);
556 - wxLogSysError(rc, _("Thread module initialization failed: failed to create thread key"));
557 + wxLogSysError(rc, "%s", _("Thread module initialization failed: failed to create thread key"));
561 --- wxWidgets-2.8.12/src/common/ftp.cpp.orig 2011-03-22 12:59:41.000000000 +0100
562 +++ wxWidgets-2.8.12/src/common/ftp.cpp 2012-09-30 10:18:44.061662974 +0200
564 if ( !sockSrv->WaitForAccept() )
566 m_lastError = wxPROTO_CONNERR;
567 - wxLogError(_("Timeout while waiting for FTP server to connect, try passive mode."));
568 + wxLogError("%s", _("Timeout while waiting for FTP server to connect, try passive mode."));
574 m_lastError = wxPROTO_PROTERR;
576 - wxLogError(_("The FTP server doesn't support the PORT command."));
577 + wxLogError("%s", _("The FTP server doesn't support the PORT command."));
583 if ( !DoSimpleCommand(_T("PASV")) )
585 - wxLogError(_("The FTP server doesn't support passive mode."));
586 + wxLogError("%s", _("The FTP server doesn't support passive mode."));
590 --- wxWidgets-2.8.12/src/unix/utilsunx.cpp.orig 2011-03-22 13:01:28.000000000 +0100
591 +++ wxWidgets-2.8.12/src/unix/utilsunx.cpp 2012-09-30 10:28:09.194984528 +0200
593 switch ( select(fd + 1, &readfds, NULL, NULL, &tv) )
596 - wxLogSysError(_("Impossible to get child process input"));
597 + wxLogSysError("%s", _("Impossible to get child process input"));
603 if ( pid == -1 ) // error?
605 - wxLogSysError( _("Fork failed") );
606 + wxLogSysError("%s", _("Fork failed") );
611 dup2(pipeOut[wxPipe::Write], STDOUT_FILENO) == -1 ||
612 dup2(pipeErr[wxPipe::Write], STDERR_FILENO) == -1 )
614 - wxLogSysError(_("Failed to redirect child process input/output"));
615 + wxLogSysError("%s", _("Failed to redirect child process input/output"));
623 - wxLogSysError(_("Cannot get the hostname"));
624 + wxLogSysError("%s", _("Cannot get the hostname"));
629 struct hostent *host = gethostbyname(wxSafeConvertWX2MB(buf));
632 - wxLogSysError(_("Cannot get the official hostname"));
633 + wxLogSysError("%s", _("Cannot get the official hostname"));
637 --- wxWidgets-2.8.12/src/common/sckaddr.cpp.orig 2011-03-22 12:59:42.000000000 +0100
638 +++ wxWidgets-2.8.12/src/common/sckaddr.cpp 2012-09-30 10:54:15.261618553 +0200
640 // Some people are sometimes fool.
643 - wxLogWarning( _("Trying to solve a NULL hostname: giving up") );
644 + wxLogWarning("%s", _("Trying to solve a NULL hostname: giving up") );
647 m_origHostname = name;
648 --- wxWidgets-2.8.12/src/common/socket.cpp.orig 2011-03-22 12:59:42.000000000 +0100
649 +++ wxWidgets-2.8.12/src/common/socket.cpp 2012-09-30 10:58:04.798280436 +0200
652 if (sig != 0xfeeddead)
654 - wxLogWarning(_("wxSocket: invalid signature in ReadMsg."));
655 + wxLogWarning("%s", _("wxSocket: invalid signature in ReadMsg."));
661 if (sig != 0xdeadfeed)
663 - wxLogWarning(_("wxSocket: invalid signature in ReadMsg."));
664 + wxLogWarning("%s", _("wxSocket: invalid signature in ReadMsg."));
669 case GSOCK_CONNECTION: flag = GSOCK_CONNECTION_FLAG; break;
670 case GSOCK_LOST: flag = GSOCK_LOST_FLAG; break;
672 - wxLogWarning(_("wxSocket: unknown event!."));
673 + wxLogWarning("%s", _("wxSocket: unknown event!."));
677 --- wxWidgets-2.8.12/src/unix/displayx11.cpp.orig 2011-03-22 13:01:28.000000000 +0100
678 +++ wxWidgets-2.8.12/src/unix/displayx11.cpp 2012-09-30 15:55:56.814574597 +0200
683 - wxLogSysError(_("Failed to enumerate video modes"));
684 + wxLogSysError("%s", _("Failed to enumerate video modes"));
690 if( !XF86VidModeGetAllModeLines((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()), &nNumModes, &ppXModes) )
692 - wxLogSysError(_("Failed to change video mode"));
693 + wxLogSysError("%s", _("Failed to change video mode"));
697 --- wxWidgets-2.8.12/src/unix/dialup.cpp.orig 2011-03-22 13:01:28.000000000 +0100
698 +++ wxWidgets-2.8.12/src/unix/dialup.cpp 2012-09-30 15:56:29.271240585 +0200
703 - wxLogError(_("Already dialling ISP."));
704 + wxLogError("%s", _("Already dialling ISP."));
708 --- wxWidgets-2.8.12/src/gtk/textctrl.cpp.orig 2011-03-22 13:01:32.000000000 +0100
709 +++ wxWidgets-2.8.12/src/gtk/textctrl.cpp 2012-09-30 16:21:18.987876200 +0200
710 @@ -1015,7 +1015,7 @@
712 // see comment in WriteText() as to why we must warn the user about
714 - wxLogWarning(_("Failed to set text in the text control."));
715 + wxLogWarning("%s", _("Failed to set text in the text control."));
719 @@ -1072,7 +1072,7 @@
720 // we must log an error here as losing the text like this can be a
721 // serious problem (e.g. imagine the document edited by user being
722 // empty instead of containing the correct text)
723 - wxLogWarning(_("Failed to insert text in the control."));
724 + wxLogWarning("%s", _("Failed to insert text in the control."));
728 --- wxWidgets-2.8.12/src/common/docview.cpp.orig 2011-03-22 12:59:40.000000000 +0100
729 +++ wxWidgets-2.8.12/src/common/docview.cpp 2012-09-30 16:43:04.191182329 +0200
734 - wxLogError(_("Sorry, could not open this file."));
735 + wxLogError("%s", _("Sorry, could not open this file."));
739 --- wxWidgets-2.8.12/src/common/fontmap.cpp.orig 2011-03-22 12:59:41.000000000 +0100
740 +++ wxWidgets-2.8.12/src/common/fontmap.cpp 2012-09-30 16:47:20.114510328 +0200
743 if ( encoding == wxFONTENCODING_SYSTEM )
745 - wxLogFatalError(_("can't load any font, aborting"));
746 + wxLogFatalError("%s", _("can't load any font, aborting"));
748 // wxLogFatalError doesn't return
750 --- wxWidgets-2.8.12/src/common/imagbmp.cpp.orig 2011-03-22 12:59:41.000000000 +0100
751 +++ wxWidgets-2.8.12/src/common/imagbmp.cpp 2012-09-30 16:57:19.711164497 +0200
756 - wxLogError(_("BMP: Couldn't save invalid image."));
757 + wxLogError("%s", _("BMP: Couldn't save invalid image."));
765 - wxLogError(_("BMP: wxImage doesn't have own wxPalette."));
766 + wxLogError("%s", _("BMP: wxImage doesn't have own wxPalette."));
774 - wxLogError(_("BMP: Couldn't write the file (Bitmap) header."));
775 + wxLogError("%s", _("BMP: Couldn't write the file (Bitmap) header."));
783 - wxLogError(_("BMP: Couldn't write the file (BitmapInfo) header."));
784 + wxLogError("%s", _("BMP: Couldn't write the file (BitmapInfo) header."));
789 if ( !stream.Write(rgbquad, palette_size*4) )
792 - wxLogError(_("BMP: Couldn't write RGB color map."));
793 + wxLogError("%s", _("BMP: Couldn't write RGB color map."));
798 if ( !stream.Write(buffer, row_width) )
801 - wxLogError(_("BMP: Couldn't write data."));
802 + wxLogError("%s", _("BMP: Couldn't write data."));
810 - wxLogError(_("BMP: Couldn't allocate memory."));
811 + wxLogError("%s", _("BMP: Couldn't allocate memory."));
819 - wxLogError( _("BMP: Couldn't allocate memory.") );
820 + wxLogError("%s", _("BMP: Couldn't allocate memory.") );
828 - wxLogError(_("BMP: Couldn't allocate memory."));
829 + wxLogError("%s", _("BMP: Couldn't allocate memory."));
833 @@ -898,13 +898,13 @@
837 - wxLogError( _("DIB Header: Image width > 32767 pixels for file.") );
838 + wxLogError("%s", _("DIB Header: Image width > 32767 pixels for file.") );
841 if ( height > 32767 )
844 - wxLogError( _("DIB Header: Image height > 32767 pixels for file.") );
845 + wxLogError("%s", _("DIB Header: Image height > 32767 pixels for file.") );
850 if ( bpp != 1 && bpp != 4 && bpp != 8 && bpp != 16 && bpp != 24 && bpp != 32 )
853 - wxLogError( _("DIB Header: Unknown bitdepth in file.") );
854 + wxLogError("%s", _("DIB Header: Unknown bitdepth in file.") );
859 comp != BI_BITFIELDS )
862 - wxLogError( _("DIB Header: Unknown encoding in file.") );
863 + wxLogError("%s", _("DIB Header: Unknown encoding in file.") );
868 ((comp == BI_BITFIELDS) && (bpp != 16 && bpp != 32)))
871 - wxLogError( _("DIB Header: Encoding doesn't match bitdepth.") );
872 + wxLogError("%s", _("DIB Header: Encoding doesn't match bitdepth.") );
877 verbose, IsBmp, true) )
880 - wxLogError( _("Error in reading image DIB.") );
881 + wxLogError("%s", _("Error in reading image DIB.") );
886 verbose, IsBmp, false) )
889 - wxLogError( _("ICO: Error in reading mask DIB.") );
890 + wxLogError("%s", _("ICO: Error in reading mask DIB.") );
893 image->SetMaskFromImage(mask, 255, 255, 255);
894 @@ -1037,13 +1037,13 @@
895 if ( image->GetHeight () > 127 )
898 - wxLogError(_("ICO: Image too tall for an icon."));
899 + wxLogError("%s", _("ICO: Image too tall for an icon."));
902 if ( image->GetWidth () > 255 )
905 - wxLogError(_("ICO: Image too wide for an icon."));
906 + wxLogError("%s", _("ICO: Image too wide for an icon."));
910 @@ -1069,7 +1069,7 @@
911 if ( !stream.IsOk() )
914 - wxLogError(_("ICO: Error writing the image file!"));
915 + wxLogError("%s", _("ICO: Error writing the image file!"));
919 @@ -1128,7 +1128,7 @@
923 - wxLogError(_("ICO: Error writing the image file!"));
924 + wxLogError("%s", _("ICO: Error writing the image file!"));
928 @@ -1137,7 +1137,7 @@
932 - wxLogError(_("ICO: Error writing the image file!"));
933 + wxLogError("%s", _("ICO: Error writing the image file!"));
936 wxUint32 Size = cStream.GetSize();
937 @@ -1192,7 +1192,7 @@
938 if ( !stream.IsOk() )
941 - wxLogError(_("ICO: Error writing the image file!"));
942 + wxLogError("%s", _("ICO: Error writing the image file!"));
946 @@ -1202,7 +1202,7 @@
950 - wxLogError(_("ICO: Error writing the image file!"));
951 + wxLogError("%s", _("ICO: Error writing the image file!"));
955 @@ -1211,7 +1211,7 @@
959 - wxLogError(_("ICO: Error writing the image file!"));
960 + wxLogError("%s", _("ICO: Error writing the image file!"));
964 @@ -1276,7 +1276,7 @@
966 if ( iSel == wxNOT_FOUND || iSel < 0 || iSel >= nIcons )
968 - wxLogError(_("ICO: Invalid icon index."));
969 + wxLogError("%s", _("ICO: Invalid icon index."));
973 --- wxWidgets-2.8.12/src/common/image.cpp.orig 2011-03-22 12:59:41.000000000 +0100
974 +++ wxWidgets-2.8.12/src/common/image.cpp 2012-09-30 16:59:23.204495257 +0200
975 @@ -1842,7 +1842,7 @@
976 // check that the images are the same size
977 if ( (M_IMGDATA->m_height != mask.GetHeight() ) || (M_IMGDATA->m_width != mask.GetWidth () ) )
979 - wxLogError( _("Image and mask have different sizes.") );
980 + wxLogError("%s", _("Image and mask have different sizes.") );
984 @@ -1850,7 +1850,7 @@
985 unsigned char r,g,b ;
986 if (!FindFirstUnusedColour(&r, &g, &b))
988 - wxLogError( _("No unused colour in image being masked.") );
989 + wxLogError("%s", _("No unused colour in image being masked.") );
993 @@ -1891,7 +1891,7 @@
994 unsigned char mr, mg, mb;
995 if (!FindFirstUnusedColour(&mr, &mg, &mb))
997 - wxLogError( _("No unused colour in image being masked.") );
998 + wxLogError("%s", _("No unused colour in image being masked.") );
1002 @@ -2172,7 +2172,7 @@
1006 - wxLogWarning(_("No handler found for image type."));
1007 + wxLogWarning("%s", _("No handler found for image type."));
1011 @@ -2215,7 +2215,7 @@
1015 - wxLogWarning( _("No handler found for image type.") );
1016 + wxLogWarning("%s", _("No handler found for image type.") );
1020 @@ -2696,7 +2696,7 @@
1024 - wxLogError(_("No unused colour in image.") );
1025 + wxLogError("%s",_("No unused colour in image.") );
1029 --- wxWidgets-2.8.12/src/common/imaggif.cpp.orig 2011-03-22 12:59:41.000000000 +0100
1030 +++ wxWidgets-2.8.12/src/common/imaggif.cpp 2012-09-30 17:04:34.731155430 +0200
1034 case wxGIF_INVFORMAT:
1035 - wxLogError(_("GIF: error in GIF image format."));
1036 + wxLogError("%s", _("GIF: error in GIF image format."));
1039 - wxLogError(_("GIF: not enough memory."));
1040 + wxLogError("%s", _("GIF: not enough memory."));
1043 - wxLogError(_("GIF: unknown error!!!"));
1044 + wxLogError("%s", _("GIF: unknown error!!!"));
1050 if ((error == wxGIF_TRUNCATED) && verbose)
1052 - wxLogError(_("GIF: data stream seems to be truncated."));
1053 + wxLogError("%s", _("GIF: data stream seems to be truncated."));
1054 /* go on; image data is OK */
1061 - wxLogError(_("GIF: Invalid gif index."));
1062 + wxLogError("%s", _("GIF: Invalid gif index."));
1066 --- wxWidgets-2.8.12/src/common/imagjpeg.cpp.orig 2011-03-22 12:59:41.000000000 +0100
1067 +++ wxWidgets-2.8.12/src/common/imagjpeg.cpp 2012-09-30 18:17:01.807731491 +0200
1069 * We need to clean up the JPEG object, close the input file, and return.
1072 - wxLogError(_("JPEG: Couldn't load - file is probably corrupted."));
1073 + wxLogError("%s", _("JPEG: Couldn't load - file is probably corrupted."));
1074 (cinfo.src->term_source)(&cinfo);
1075 jpeg_destroy_decompress(&cinfo);
1076 if (image->Ok()) image->Destroy();
1078 * We need to clean up the JPEG object, close the input file, and return.
1081 - wxLogError(_("JPEG: Couldn't save image."));
1082 + wxLogError("%s", _("JPEG: Couldn't save image."));
1083 jpeg_destroy_compress(&cinfo);
1086 --- wxWidgets-2.8.12/src/common/imagpcx.cpp.orig 2011-03-22 12:59:41.000000000 +0100
1087 +++ wxWidgets-2.8.12/src/common/imagpcx.cpp 2012-09-30 18:19:28.711061763 +0200
1089 if (!CanRead(stream))
1092 - wxLogError(_("PCX: this is not a PCX file."));
1093 + wxLogError("%s", _("PCX: this is not a PCX file."));
1097 @@ -452,10 +452,10 @@
1101 - case wxPCX_INVFORMAT: wxLogError(_("PCX: image format unsupported")); break;
1102 - case wxPCX_MEMERR: wxLogError(_("PCX: couldn't allocate memory")); break;
1103 - case wxPCX_VERERR: wxLogError(_("PCX: version number too low")); break;
1104 - default: wxLogError(_("PCX: unknown error !!!"));
1105 + case wxPCX_INVFORMAT: wxLogError("%s", _("PCX: image format unsupported")); break;
1106 + case wxPCX_MEMERR: wxLogError("%s", _("PCX: couldn't allocate memory")); break;
1107 + case wxPCX_VERERR: wxLogError("%s", _("PCX: version number too low")); break;
1108 + default: wxLogError("%s", _("PCX: unknown error !!!"));
1116 - case wxPCX_INVFORMAT: wxLogError(_("PCX: invalid image")); break;
1117 - case wxPCX_MEMERR: wxLogError(_("PCX: couldn't allocate memory")); break;
1118 - default: wxLogError(_("PCX: unknown error !!!"));
1119 + case wxPCX_INVFORMAT: wxLogError("%s", _("PCX: invalid image")); break;
1120 + case wxPCX_MEMERR: wxLogError("%s", _("PCX: couldn't allocate memory")); break;
1121 + default: wxLogError("%s", _("PCX: unknown error !!!"));
1125 --- wxWidgets-2.8.12/src/common/imagpng.cpp.orig 2011-03-22 12:59:41.000000000 +0100
1126 +++ wxWidgets-2.8.12/src/common/imagpng.cpp 2012-09-30 18:21:56.457725349 +0200
1129 wxPNGInfoStruct *info = png_ptr ? WX_PNG_INFO(png_ptr) : NULL;
1130 if ( !info || info->verbose )
1131 - wxLogWarning( wxString::FromAscii(message) );
1132 + wxLogWarning("%s", message );
1138 if ( !h.FindFirstUnusedColour(&rMask, &gMask, &bMask) )
1140 - wxLogWarning(_("Too many colours in PNG, the image may be slightly blurred."));
1141 + wxLogWarning("%s", _("Too many colours in PNG, the image may be slightly blurred."));
1143 // use a fixed mask colour and we'll fudge
1144 // the real pixels with this colour (see
1149 - wxLogError(_("Couldn't load a PNG image - file is corrupted or not enough memory."));
1150 + wxLogError("%s", _("Couldn't load a PNG image - file is corrupted or not enough memory."));
1158 - wxLogError(_("Couldn't save PNG image."));
1159 + wxLogError("%s", _("Couldn't save PNG image."));
1165 png_destroy_write_struct( &png_ptr, (png_infopp)NULL );
1167 - wxLogError(_("Couldn't save PNG image."));
1168 + wxLogError("%s", _("Couldn't save PNG image."));
1174 png_destroy_write_struct( &png_ptr, (png_infopp)NULL );
1176 - wxLogError(_("Couldn't save PNG image."));
1177 + wxLogError("%s", _("Couldn't save PNG image."));
1181 --- wxWidgets-2.8.12/src/common/imagpnm.cpp.orig 2011-03-22 12:59:41.000000000 +0100
1182 +++ wxWidgets-2.8.12/src/common/imagpnm.cpp 2012-09-30 18:26:48.461052596 +0200
1184 case wxT('5'): // RAW Grey
1185 case wxT('6'): break;
1187 - if (verbose) wxLogError(_("PNM: File format is not recognized."));
1188 + if (verbose) wxLogError("%s", _("PNM: File format is not recognized."));
1196 - wxLogError( _("PNM: Couldn't allocate memory.") );
1197 + wxLogError("%s", _("PNM: Couldn't allocate memory.") );
1202 *ptr++=(unsigned char)value; // B
1205 - if (verbose) wxLogError(_("PNM: File seems truncated."));
1206 + if (verbose) wxLogError("%s", _("PNM: File seems truncated."));
1214 - if (verbose) wxLogError(_("PNM: File seems truncated."));
1215 + if (verbose) wxLogError("%s", _("PNM: File seems truncated."));
1223 - if (verbose) wxLogError(_("PNM: File seems truncated."));
1224 + if (verbose) wxLogError("%s", _("PNM: File seems truncated."));
1228 --- wxWidgets-2.8.12/src/common/imagtiff.cpp.orig 2011-03-22 12:59:41.000000000 +0100
1229 +++ wxWidgets-2.8.12/src/common/imagtiff.cpp 2012-09-30 18:35:21.521041902 +0200
1234 - wxLogError( _("TIFF: Error loading image.") );
1235 + wxLogError("%s", _("TIFF: Error loading image.") );
1240 if (!TIFFSetDirectory( tif, (tdir_t)index ))
1243 - wxLogError( _("Invalid TIFF image index.") );
1244 + wxLogError("%s", _("Invalid TIFF image index.") );
1249 if ( bytesNeeded >= 4294967295U /* UINT32_MAX */ )
1252 - wxLogError( _("TIFF: Image size is abnormally big.") );
1253 + wxLogError("%s", _("TIFF: Image size is abnormally big.") );
1261 - wxLogError( _("TIFF: Couldn't allocate memory.") );
1262 + wxLogError("%s", _("TIFF: Couldn't allocate memory.") );
1270 - wxLogError( _("TIFF: Couldn't allocate memory.") );
1271 + wxLogError("%s", _("TIFF: Couldn't allocate memory.") );
1273 _TIFFfree( raster );
1276 if (!TIFFReadRGBAImage( tif, w, h, raster, 0 ))
1279 - wxLogError( _("TIFF: Error reading image.") );
1280 + wxLogError("%s", _("TIFF: Error reading image.") );
1282 _TIFFfree( raster );
1288 - wxLogError( _("TIFF: Error saving image.") );
1289 + wxLogError("%s", _("TIFF: Error saving image.") );
1297 - wxLogError( _("TIFF: Couldn't allocate memory.") );
1298 + wxLogError("%s", _("TIFF: Couldn't allocate memory.") );
1303 if ( TIFFWriteScanline(tif, buf ? buf : ptr, (uint32)row, 0) < 0 )
1306 - wxLogError( _("TIFF: Error writing image.") );
1307 + wxLogError("%s", _("TIFF: Error writing image.") );
1311 --- wxWidgets-2.8.12/src/common/textcmn.cpp.orig 2011-03-22 12:59:42.000000000 +0100
1312 +++ wxWidgets-2.8.12/src/common/textcmn.cpp 2012-09-30 18:39:49.751036311 +0200
1317 - wxLogError(_("File couldn't be loaded."));
1318 + wxLogError("%s", _("File couldn't be loaded."));
1319 #endif // wxUSE_FFILE
1324 #endif // wxUSE_FFILE
1326 - wxLogError(_("The text couldn't be saved."));
1327 + wxLogError("%s", _("The text couldn't be saved."));
1331 --- wxWidgets-2.8.12/src/common/wincmn.cpp.orig 2011-03-22 12:59:42.000000000 +0100
1332 +++ wxWidgets-2.8.12/src/common/wincmn.cpp 2012-09-30 18:43:17.657698645 +0200
1333 @@ -1552,7 +1552,7 @@
1334 wxValidator *validator = child->GetValidator();
1335 if ( validator && !validator->TransferToWindow() )
1337 - wxLogWarning(_("Could not transfer data to window"));
1338 + wxLogWarning("%s", _("Could not transfer data to window"));
1340 wxLog::FlushActive();
1342 --- wxWidgets-2.8.12/src/common/xpmdecod.cpp.orig 2011-03-22 12:59:42.000000000 +0100
1343 +++ wxWidgets-2.8.12/src/common/xpmdecod.cpp 2012-09-30 18:44:05.621030978 +0200
1345 &width, &height, &colors_cnt, &chars_per_pixel);
1346 if ( count != 4 || width * height * colors_cnt == 0 )
1348 - wxLogError(_("XPM: incorrect header format!"));
1349 + wxLogError("%s", _("XPM: incorrect header format!"));
1354 entry = clr_tbl.find(key);
1357 - wxLogError(_("XPM: Malformed pixel data!"));
1358 + wxLogError("%s", _("XPM: Malformed pixel data!"));
1360 // better return right now as otherwise we risk to flood the
1361 // user with error messages as something seems to be seriously
1362 --- wxWidgets-2.8.12/src/generic/dcpsg.cpp.orig 2011-03-22 12:59:43.000000000 +0100
1363 +++ wxWidgets-2.8.12/src/generic/dcpsg.cpp 2012-09-30 18:47:32.884359991 +0200
1364 @@ -1583,7 +1583,7 @@
1368 - wxLogError( _("Cannot open file for PostScript printing!"));
1369 + wxLogError("%s", _("Cannot open file for PostScript printing!"));
1373 --- wxWidgets-2.8.12/src/generic/logg.cpp.orig 2011-03-22 12:59:43.000000000 +0100
1374 +++ wxWidgets-2.8.12/src/generic/logg.cpp 2012-09-30 19:07:07.851002168 +0200
1379 - wxLogError(_("Can't save log contents to file."));
1380 + wxLogError("%s", _("Can't save log contents to file."));
1383 wxLogStatus(this, _("Log saved to the file '%s'."), filename.c_str());
1384 @@ -1023,7 +1023,7 @@
1388 - wxLogError(_("Can't save log contents to file."));
1389 + wxLogError("%s", _("Can't save log contents to file."));
1390 #endif // wxUSE_FILEDLG
1393 --- wxWidgets-2.8.12/src/generic/printps.cpp.orig 2011-03-22 12:59:43.000000000 +0100
1394 +++ wxWidgets-2.8.12/src/generic/printps.cpp 2012-09-30 19:41:36.954292375 +0200
1396 if (!printout->OnBeginDocument(m_printDialogData.GetFromPage(), m_printDialogData.GetToPage()))
1399 - wxLogError(_("Could not start printing."));
1400 + wxLogError("%s", _("Could not start printing."));
1401 sm_lastError = wxPRINTER_ERROR;
1404 --- wxWidgets-2.8.12/src/unix/sound.cpp.orig 2011-03-22 13:01:28.000000000 +0100
1405 +++ wxWidgets-2.8.12/src/unix/sound.cpp 2012-09-30 20:03:09.254265441 +0200
1408 if (!LoadWAV(data, size, true))
1410 - wxLogError(_("Sound data are in unsupported format."));
1411 + wxLogError("%s", _("Sound data are in unsupported format."));
1415 --- wxWidgets-2.8.12/src/html/chm.cpp.orig 2011-03-22 12:59:44.000000000 +0100
1416 +++ wxWidgets-2.8.12/src/html/chm.cpp 2012-09-30 20:31:12.494230355 +0200
1419 if ( GetProtocol(left) != _T("file") )
1421 - wxLogError(_("CHM handler currently supports only local files!"));
1422 + wxLogError("%s", _("CHM handler currently supports only local files!"));
1427 if ( (index=right.Index(_T("//"))) != wxNOT_FOUND )
1429 right=wxString(right.Mid(index+1));
1430 - wxLogWarning(_("Link contained '//', converted to absolute link."));
1431 + wxLogWarning("%s", _("Link contained '//', converted to absolute link."));
1434 wxFileName leftFilename = wxFileSystem::URLToFileName(left);
1437 if ( GetProtocol(left) != _T("file") )
1439 - wxLogError(_("CHM handler currently supports only local files!"));
1440 + wxLogError("%s", _("CHM handler currently supports only local files!"));
1441 return wxEmptyString;
1444 --- wxWidgets-2.8.12/src/html/helpwnd.cpp.orig 2011-03-22 12:59:44.000000000 +0100
1445 +++ wxWidgets-2.8.12/src/html/helpwnd.cpp 2012-09-30 20:54:46.604200882 +0200
1446 @@ -1553,7 +1553,7 @@
1447 if (m_Printer == NULL)
1448 m_Printer = new wxHtmlEasyPrinting(_("Help Printing"), this);
1449 if (!m_HtmlWin->GetOpenedPage())
1450 - wxLogWarning(_("Cannot print empty page."));
1451 + wxLogWarning("%s", _("Cannot print empty page."));
1453 m_Printer->PrintFile(m_HtmlWin->GetOpenedPage());
1455 --- wxWidgets-2.8.12/src/html/htmlpars.cpp.orig 2011-03-22 12:59:44.000000000 +0100
1456 +++ wxWidgets-2.8.12/src/html/htmlpars.cpp 2012-09-30 20:58:05.014196745 +0200
1458 #endif // wxUSE_STL/!wxUSE_STL
1461 - wxLogWarning(_("Warning: attempt to remove HTML tag handler from empty stack."));
1462 + wxLogWarning("%s", _("Warning: attempt to remove HTML tag handler from empty stack."));
1465 m_HandlersHash = *((wxHashTable*) first->GetData());
1466 --- wxWidgets-2.8.12/src/html/htmprint.cpp.orig 2011-03-22 12:59:44.000000000 +0100
1467 +++ wxWidgets-2.8.12/src/html/htmprint.cpp 2012-09-30 21:01:26.160859220 +0200
1472 - wxLogError(htmlfile + _(": file does not exist!"));
1473 + wxLogError("%s", (htmlfile + _(": file does not exist!")).c_str());
1479 if (!GetPrintData()->Ok())
1481 - wxLogError(_("There was a problem during page setup: you may need to set a default printer."));
1482 + wxLogError("%s", _("There was a problem during page setup: you may need to set a default printer."));
1486 --- wxWidgets-2.8.12/src/common/debugrpt.cpp.orig 2011-03-22 12:59:40.000000000 +0100
1487 +++ wxWidgets-2.8.12/src/common/debugrpt.cpp 2012-09-30 21:10:30.830847867 +0200
1489 if ( !wxMkdir(m_dir, 0700) )
1491 wxLogSysError(_("Failed to create directory \"%s\""), m_dir.c_str());
1492 - wxLogError(_("Debug report couldn't be created."));
1493 + wxLogError("%s", _("Debug report couldn't be created."));
1499 if ( !GetFilesCount() )
1501 - wxLogError(_("Debug report generation has failed."));
1502 + wxLogError("%s", _("Debug report generation has failed."));
1510 - wxLogError(_("Failed to execute curl, please install it in PATH."));
1511 + wxLogError("%s", _("Failed to execute curl, please install it in PATH."));
1515 --- wxWidgets-2.8.12/src/xrc/xh_statbar.cpp.orig 2011-03-22 13:00:29.000000000 +0100
1516 +++ wxWidgets-2.8.12/src/xrc/xh_statbar.cpp 2012-10-01 18:20:53.155925824 +0200
1518 else if (first == wxT("wxSB_RAISED"))
1519 style[i] = wxSB_RAISED;
1520 else if (!first.empty())
1521 - wxLogError(wxT("Error in resource, unknown statusbar field style: ") + first);
1522 + wxLogError("%s", (wxT("Error in resource, unknown statusbar field style: ") + first).c_str());
1524 if(styles.Find(wxT(',')))
1525 styles.Remove(0, styles.Find(wxT(',')) + 1);
1526 --- wxWidgets-2.8.12/src/xrc/xmlres.cpp.orig 2011-03-22 13:00:29.000000000 +0100
1527 +++ wxWidgets-2.8.12/src/xrc/xmlres.cpp 2012-10-01 18:38:22.405903953 +0200
1529 m_version = version;
1530 if (m_version != version)
1532 - wxLogError(_("Resource files must have same version number!"));
1533 + wxLogError("%s", _("Resource files must have same version number!"));
1538 if (index != wxNOT_FOUND)
1539 style |= m_styleValues[index];
1541 - wxLogError(_("Unknown style flag ") + fl);
1542 + wxLogError("%s", (_("Unknown style flag ") + fl).c_str());
1546 @@ -1268,7 +1268,7 @@
1550 - wxLogError(_("Cannot convert dialog units: dialog unknown."));
1551 + wxLogError("%s", _("Cannot convert dialog units: dialog unknown."));
1552 return wxDefaultSize;
1555 @@ -1316,7 +1316,7 @@
1559 - wxLogError(_("Cannot convert dialog units: dialog unknown."));
1560 + wxLogError("%s", _("Cannot convert dialog units: dialog unknown."));
1564 --- wxWidgets-2.8.12/src/richtext/richtextctrl.cpp.orig 2011-03-22 12:59:44.000000000 +0100
1565 +++ wxWidgets-2.8.12/src/richtext/richtextctrl.cpp 2012-10-01 18:56:32.329214568 +0200
1566 @@ -2135,7 +2135,7 @@
1570 - wxLogError(_("File couldn't be loaded."));
1571 + wxLogError("%s", _("File couldn't be loaded."));
1575 @@ -2152,7 +2152,7 @@
1579 - wxLogError(_("The text couldn't be saved."));
1580 + wxLogError("%s", _("The text couldn't be saved."));
1584 --- wxWidgets-2.8.12/src/richtext/richtextprint.cpp.orig 2011-03-22 12:59:44.000000000 +0100
1585 +++ wxWidgets-2.8.12/src/richtext/richtextprint.cpp 2012-10-01 19:03:12.205872900 +0200
1588 if (!GetPrintData()->Ok())
1590 - wxLogError(_("There was a problem during page setup: you may need to set a default printer."));
1591 + wxLogError("%s", _("There was a problem during page setup: you may need to set a default printer."));