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/src/common/file.cpp.orig 2011-03-22 12:59:40.000000000 +0100
46 +++ wxWidgets-2.8.12/src/common/file.cpp 2012-09-30 08:19:02.785145988 +0200
48 if ( chmod( (const char*) m_strTemp.fn_str(), mode) == -1 )
51 - wxLogSysError(_("Failed to set temporary file permissions"));
52 + wxLogSysError("%s", _("Failed to set temporary file permissions"));
56 --- wxWidgets-2.8.12/src/common/fileconf.cpp.orig 2011-03-22 12:59:41.000000000 +0100
57 +++ wxWidgets-2.8.12/src/common/fileconf.cpp 2012-09-30 08:20:45.761810510 +0200
60 if ( err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF )
62 - wxLogError(_("Error reading config options."));
63 + wxLogError("%s", _("Error reading config options."));
69 if ( !file.IsOpened() )
71 - wxLogError(_("can't open user configuration file."));
72 + wxLogError("%s", _("can't open user configuration file."));
76 @@ -1057,13 +1057,13 @@
78 if ( !file.Write(filetext, *m_conv) )
80 - wxLogError(_("can't write user configuration file."));
81 + wxLogError("%s", _("can't write user configuration file."));
87 - wxLogError(_("Failed to update user configuration file."));
88 + wxLogError("%s", _("Failed to update user configuration file."));
93 wxCharBuffer buf(line.mb_str(conv));
94 if ( !os.Write(buf, strlen(buf)) )
96 - wxLogError(_("Error saving user configuration data."));
97 + wxLogError("%s", _("Error saving user configuration data."));
101 --- wxWidgets-2.8.12/src/common/filename.cpp.orig 2011-03-22 12:59:41.000000000 +0100
102 +++ wxWidgets-2.8.12/src/common/filename.cpp 2012-09-30 08:26:13.781803673 +0200
107 - wxLogSysError(_("Failed to create a temporary file name"));
108 + wxLogSysError("%s", _("Failed to create a temporary file name"));
113 // fails, though of course it should be protected against
114 // possible infinite looping too.
116 - wxLogError(_("Failed to open temporary file."));
117 + wxLogError("%s", _("Failed to open temporary file."));
121 --- wxWidgets-2.8.12/src/common/filefn.cpp.orig 2011-03-22 12:59:41.000000000 +0100
122 +++ wxWidgets-2.8.12/src/common/filefn.cpp 2012-09-30 09:03:28.965090416 +0200
123 @@ -1513,7 +1513,7 @@
127 - wxLogSysError(_("Failed to get the working directory"));
128 + wxLogSysError("%s", _("Failed to get the working directory"));
130 // VZ: the old code used to return "." on error which didn't make any
131 // sense at all to me - empty string is a better error indicator
132 --- wxWidgets-2.8.12/src/common/init.cpp.orig 2011-03-22 12:59:41.000000000 +0100
133 +++ wxWidgets-2.8.12/src/common/init.cpp 2012-09-30 09:06:52.951752832 +0200
136 if ( !wxModule::InitializeModules() )
138 - wxLogError(_("Initialization failed in post init, aborting."));
139 + wxLogError("%s", _("Initialization failed in post init, aborting."));
143 --- wxWidgets-2.8.12/src/common/stopwatch.cpp.orig 2011-03-22 12:59:42.000000000 +0100
144 +++ wxWidgets-2.8.12/src/common/stopwatch.cpp 2012-09-30 09:13:41.768410978 +0200
146 if (( t0 != (time_t)-1 ) && ( t1 != (time_t)-1 ))
147 return (long)difftime(t1, t0) + (60 * 60 * 24 * 4);
149 - wxLogSysError(_("Failed to get the local system time"));
150 + wxLogSysError("%s", _("Failed to get the local system time"));
158 - wxLogError(_("wxGetTimeOfDay failed."));
159 + wxLogError("%s", _("wxGetTimeOfDay failed."));
162 #elif defined(HAVE_FTIME)
163 --- wxWidgets-2.8.12/src/common/tarstrm.cpp.orig 2011-03-22 12:59:42.000000000 +0100
164 +++ wxWidgets-2.8.12/src/common/tarstrm.cpp 2012-09-30 09:40:58.075043539 +0200
167 m_hdr->Read(*m_parent_i_stream);
168 if (m_parent_i_stream->Eof())
169 - wxLogError(_("incomplete header block in tar"));
170 + wxLogError("%s", _("incomplete header block in tar"));
171 if (!*m_parent_i_stream)
172 return wxSTREAM_READ_ERROR;
173 m_offset += TAR_BLOCKSIZE;
175 if (m_sumType == SUM_SIGNED)
176 ok = chksum == m_hdr->Sum(true);
178 - wxLogError(_("checksum failure reading tar header block"));
179 + wxLogError("%s", _("checksum failure reading tar header block"));
180 return wxSTREAM_READ_ERROR;
186 if (!ok || recPos < len || size != lastread) {
187 - wxLogWarning(_("invalid data in extended tar header"));
188 + wxLogWarning("%s", _("invalid data in extended tar header"));
193 wxFileOffset wxTarInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
196 - wxLogError(_("tar entry not open"));
197 + wxLogError("%s", _("tar entry not open"));
198 m_lasterror = wxSTREAM_READ_ERROR;
201 @@ -1018,7 +1018,7 @@
202 size_t wxTarInputStream::OnSysRead(void *buffer, size_t size)
205 - wxLogError(_("tar entry not open"));
206 + wxLogError("%s", _("tar entry not open"));
207 m_lasterror = wxSTREAM_READ_ERROR;
209 if (!IsOk() || !size)
210 @@ -1037,7 +1037,7 @@
211 } else if (!m_parent_i_stream->IsOk()) {
212 // any other error will have been reported by the underlying stream
213 if (m_parent_i_stream->Eof())
214 - wxLogError(_("unexpected end of file"));
215 + wxLogError("%s", _("unexpected end of file"));
216 m_lasterror = wxSTREAM_READ_ERROR;
219 @@ -1371,7 +1371,7 @@
222 if (sizePos == wxInvalidOffset || !m_hdr->SetOctal(TAR_SIZE, m_pos)) {
223 - wxLogError(_("incorrect size given for tar entry"));
224 + wxLogError("%s", _("incorrect size given for tar entry"));
225 m_lasterror = wxSTREAM_WRITE_ERROR;
228 @@ -1492,7 +1492,7 @@
229 wxFileOffset wxTarOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
232 - wxLogError(_("tar entry not open"));
233 + wxLogError("%s", _("tar entry not open"));
234 m_lasterror = wxSTREAM_WRITE_ERROR;
236 if (!IsOk() || m_datapos == wxInvalidOffset)
237 @@ -1514,7 +1514,7 @@
238 size_t wxTarOutputStream::OnSysWrite(const void *buffer, size_t size)
241 - wxLogError(_("tar entry not open"));
242 + wxLogError("%s", _("tar entry not open"));
243 m_lasterror = wxSTREAM_WRITE_ERROR;
245 if (!IsOk() || !size)
246 --- wxWidgets-2.8.12/src/common/zstream.cpp.orig 2011-03-22 12:59:43.000000000 +0100
247 +++ wxWidgets-2.8.12/src/common/zstream.cpp 2012-09-30 09:47:40.141701824 +0200
252 - wxLogError(_("Gzip not supported by this version of zlib"));
253 + wxLogError("%s", _("Gzip not supported by this version of zlib"));
254 m_lasterror = wxSTREAM_READ_ERROR;
261 - wxLogError(_("Can't initialize zlib inflate stream."));
262 + wxLogError("%s", _("Can't initialize zlib inflate stream."));
263 m_lasterror = wxSTREAM_READ_ERROR;
267 m_lasterror = wxSTREAM_EOF;
270 - wxLogError(_("Can't read inflate stream: unexpected EOF in underlying stream."));
271 + wxLogError("%s", _("Can't read inflate stream: unexpected EOF in underlying stream."));
277 // if gzip is asked for but not supported...
278 if (flags == wxZLIB_GZIP && !CanHandleGZip()) {
279 - wxLogError(_("Gzip not supported by this version of zlib"));
280 + wxLogError("%s", _("Gzip not supported by this version of zlib"));
281 m_lasterror = wxSTREAM_WRITE_ERROR;
288 - wxLogError(_("Can't initialize zlib deflate stream."));
289 + wxLogError("%s", _("Can't initialize zlib deflate stream."));
290 m_lasterror = wxSTREAM_WRITE_ERROR;
293 --- wxWidgets-2.8.12/src/common/zipstrm.cpp.orig 2011-03-22 12:59:42.000000000 +0100
294 +++ wxWidgets-2.8.12/src/common/zipstrm.cpp 2012-09-30 09:49:19.005033098 +0200
296 m_parent_o_stream = &stream;
298 if (deflateReset(m_deflate) != Z_OK) {
299 - wxLogError(_("can't re-initialize zlib deflate stream"));
300 + wxLogError("%s", _("can't re-initialize zlib deflate stream"));
301 m_lasterror = wxSTREAM_WRITE_ERROR;
305 m_parent_i_stream = &stream;
307 if (inflateReset(m_inflate) != Z_OK) {
308 - wxLogError(_("can't re-initialize zlib inflate stream"));
309 + wxLogError("%s", _("can't re-initialize zlib inflate stream"));
310 m_lasterror = wxSTREAM_READ_ERROR;
313 @@ -1269,7 +1269,7 @@
315 if (m_DiskNumber != 0 || m_StartDisk != 0 ||
316 m_EntriesHere != m_TotalEntries)
317 - wxLogWarning(_("assuming this is a multi-part zip concatenated"));
318 + wxLogWarning("%s", _("assuming this is a multi-part zip concatenated"));
322 @@ -1441,7 +1441,7 @@
323 // failed, so either this is a non-seekable stream (ok), or not a zip
324 if (m_parentSeekable) {
325 m_lasterror = wxSTREAM_READ_ERROR;
326 - wxLogError(_("invalid zip file"));
327 + wxLogError("%s", _("invalid zip file"));
331 @@ -1484,7 +1484,7 @@
335 - wxLogError(_("can't find central directory in zip"));
336 + wxLogError("%s", _("can't find central directory in zip"));
337 m_lasterror = wxSTREAM_READ_ERROR;
340 @@ -1570,7 +1570,7 @@
343 if (m_signature != CENTRAL_MAGIC) {
344 - wxLogError(_("error reading zip central directory"));
345 + wxLogError("%s", _("error reading zip central directory"));
346 return wxSTREAM_READ_ERROR;
349 @@ -1661,7 +1661,7 @@
353 - wxLogError(_("error reading zip local header"));
354 + wxLogError("%s", _("error reading zip local header"));
355 return wxSTREAM_READ_ERROR;
358 @@ -1709,7 +1709,7 @@
361 if (ReadSignature() != LOCAL_MAGIC) {
362 - wxLogError(_("bad zipfile offset to entry"));
363 + wxLogError("%s", _("bad zipfile offset to entry"));
367 @@ -1776,7 +1776,7 @@
368 switch (m_entry.GetMethod()) {
369 case wxZIP_METHOD_STORE:
370 if (m_entry.GetSize() == wxInvalidOffset) {
371 - wxLogError(_("stored file length not in Zip header"));
372 + wxLogError("%s", _("stored file length not in Zip header"));
375 m_store->Open(m_entry.GetSize());
376 @@ -1790,7 +1790,7 @@
380 - wxLogError(_("unsupported Zip compression method"));
381 + wxLogError("%s", _("unsupported Zip compression method"));
385 @@ -2171,7 +2171,7 @@
389 - wxLogError(_("unsupported Zip compression method"));
390 + wxLogError("%s", _("unsupported Zip compression method"));
394 --- wxWidgets-2.8.12/include/wx/unix/pipe.h.orig 2011-03-22 13:01:28.000000000 +0100
395 +++ wxWidgets-2.8.12/include/wx/unix/pipe.h 2012-09-30 09:52:41.701695539 +0200
398 if ( pipe(m_fds) == -1 )
400 - wxLogSysError(_("Pipe creation failed"));
401 + wxLogSysError("%s", _("Pipe creation failed"));
405 --- wxWidgets-2.8.12/src/unix/baseunix.cpp.orig 2011-03-22 13:01:28.000000000 +0100
406 +++ wxWidgets-2.8.12/src/unix/baseunix.cpp 2012-09-30 09:53:20.938361388 +0200
409 if ( waitpid(execData.pid, &exitcode, 0) == -1 || !WIFEXITED(exitcode) )
411 - wxLogSysError(_("Waiting for subprocess termination failed"));
412 + wxLogSysError("%s", _("Waiting for subprocess termination failed"));
416 --- wxWidgets-2.8.12/src/unix/snglinst.cpp.orig 2011-03-22 13:01:28.000000000 +0100
417 +++ wxWidgets-2.8.12/src/unix/snglinst.cpp 2012-09-30 10:01:41.101684296 +0200
419 // another process managed to open and lock the file and terminate
420 // (erasing it) before we got here, but this should happen so
421 // rarely in practice that we don't care
422 - wxLogError(_("Failed to access lock file."));
423 + wxLogError("%s", _("Failed to access lock file."));
428 ssize_t count = file.Read(buf, WXSIZEOF(buf));
429 if ( count == wxInvalidOffset )
431 - wxLogError(_("Failed to read PID from lock file."));
432 + wxLogError("%s", _("Failed to read PID from lock file."));
436 --- wxWidgets-2.8.12/src/unix/threadpsx.cpp.orig 2011-03-22 13:01:28.000000000 +0100
437 +++ wxWidgets-2.8.12/src/unix/threadpsx.cpp 2012-09-30 10:06:25.185011707 +0200
439 int rc = pthread_setspecific(gs_keySelf, thread);
442 - wxLogSysError(rc, _("Cannot start thread: error writing TLS"));
443 + wxLogSysError(rc, "%s", _("Cannot start thread: error writing TLS"));
448 // wxLogDebug: it is possible to bring the system to its knees
449 // by creating too many threads and not joining them quite
451 - wxLogError(_("Failed to join a thread, potential memory leak detected - please restart the program"));
452 + wxLogError("%s", _("Failed to join a thread, potential memory leak detected - please restart the program"));
455 m_shouldBeJoined = false;
456 @@ -1106,7 +1106,7 @@
458 if ( pthread_attr_getschedpolicy(&attr, &policy) != 0 )
460 - wxLogError(_("Cannot retrieve thread scheduling policy."));
461 + wxLogError("%s", _("Cannot retrieve thread scheduling policy."));
465 @@ -1133,7 +1133,7 @@
466 if ( prio != WXTHREAD_DEFAULT_PRIORITY )
468 // notify the programmer that this doesn't work here
469 - wxLogWarning(_("Thread priority setting is ignored."));
470 + wxLogWarning("%s", _("Thread priority setting is ignored."));
472 //else: we have default priority, so don't complain
474 @@ -1433,7 +1433,7 @@
475 if ( pthread_cancel(m_internal->GetId()) != 0 )
476 #endif // HAVE_PTHREAD_CANCEL
478 - wxLogError(_("Failed to terminate a thread."));
479 + wxLogError("%s", _("Failed to terminate a thread."));
481 return wxTHREAD_MISC_ERROR;
483 @@ -1615,7 +1615,7 @@
484 int rc = pthread_key_create(&gs_keySelf, NULL /* dtor function */);
487 - wxLogSysError(rc, _("Thread module initialization failed: failed to create thread key"));
488 + wxLogSysError(rc, "%s", _("Thread module initialization failed: failed to create thread key"));
492 --- wxWidgets-2.8.12/src/common/ftp.cpp.orig 2011-03-22 12:59:41.000000000 +0100
493 +++ wxWidgets-2.8.12/src/common/ftp.cpp 2012-09-30 10:18:44.061662974 +0200
495 if ( !sockSrv->WaitForAccept() )
497 m_lastError = wxPROTO_CONNERR;
498 - wxLogError(_("Timeout while waiting for FTP server to connect, try passive mode."));
499 + wxLogError("%s", _("Timeout while waiting for FTP server to connect, try passive mode."));
505 m_lastError = wxPROTO_PROTERR;
507 - wxLogError(_("The FTP server doesn't support the PORT command."));
508 + wxLogError("%s", _("The FTP server doesn't support the PORT command."));
514 if ( !DoSimpleCommand(_T("PASV")) )
516 - wxLogError(_("The FTP server doesn't support passive mode."));
517 + wxLogError("%s", _("The FTP server doesn't support passive mode."));
521 --- wxWidgets-2.8.12/src/unix/utilsunx.cpp.orig 2011-03-22 13:01:28.000000000 +0100
522 +++ wxWidgets-2.8.12/src/unix/utilsunx.cpp 2012-09-30 10:28:09.194984528 +0200
524 switch ( select(fd + 1, &readfds, NULL, NULL, &tv) )
527 - wxLogSysError(_("Impossible to get child process input"));
528 + wxLogSysError("%s", _("Impossible to get child process input"));
534 if ( pid == -1 ) // error?
536 - wxLogSysError( _("Fork failed") );
537 + wxLogSysError("%s", _("Fork failed") );
542 dup2(pipeOut[wxPipe::Write], STDOUT_FILENO) == -1 ||
543 dup2(pipeErr[wxPipe::Write], STDERR_FILENO) == -1 )
545 - wxLogSysError(_("Failed to redirect child process input/output"));
546 + wxLogSysError("%s", _("Failed to redirect child process input/output"));
554 - wxLogSysError(_("Cannot get the hostname"));
555 + wxLogSysError("%s", _("Cannot get the hostname"));
560 struct hostent *host = gethostbyname(wxSafeConvertWX2MB(buf));
563 - wxLogSysError(_("Cannot get the official hostname"));
564 + wxLogSysError("%s", _("Cannot get the official hostname"));
568 --- wxWidgets-2.8.12/src/common/sckaddr.cpp.orig 2011-03-22 12:59:42.000000000 +0100
569 +++ wxWidgets-2.8.12/src/common/sckaddr.cpp 2012-09-30 10:54:15.261618553 +0200
571 // Some people are sometimes fool.
574 - wxLogWarning( _("Trying to solve a NULL hostname: giving up") );
575 + wxLogWarning("%s", _("Trying to solve a NULL hostname: giving up") );
578 m_origHostname = name;
579 --- wxWidgets-2.8.12/src/common/socket.cpp.orig 2011-03-22 12:59:42.000000000 +0100
580 +++ wxWidgets-2.8.12/src/common/socket.cpp 2012-09-30 10:58:04.798280436 +0200
583 if (sig != 0xfeeddead)
585 - wxLogWarning(_("wxSocket: invalid signature in ReadMsg."));
586 + wxLogWarning("%s", _("wxSocket: invalid signature in ReadMsg."));
592 if (sig != 0xdeadfeed)
594 - wxLogWarning(_("wxSocket: invalid signature in ReadMsg."));
595 + wxLogWarning("%s", _("wxSocket: invalid signature in ReadMsg."));
600 case GSOCK_CONNECTION: flag = GSOCK_CONNECTION_FLAG; break;
601 case GSOCK_LOST: flag = GSOCK_LOST_FLAG; break;
603 - wxLogWarning(_("wxSocket: unknown event!."));
604 + wxLogWarning("%s", _("wxSocket: unknown event!."));
608 --- wxWidgets-2.8.12/src/unix/displayx11.cpp.orig 2011-03-22 13:01:28.000000000 +0100
609 +++ wxWidgets-2.8.12/src/unix/displayx11.cpp 2012-09-30 15:55:56.814574597 +0200
614 - wxLogSysError(_("Failed to enumerate video modes"));
615 + wxLogSysError("%s", _("Failed to enumerate video modes"));
621 if( !XF86VidModeGetAllModeLines((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()), &nNumModes, &ppXModes) )
623 - wxLogSysError(_("Failed to change video mode"));
624 + wxLogSysError("%s", _("Failed to change video mode"));
628 --- wxWidgets-2.8.12/src/unix/dialup.cpp.orig 2011-03-22 13:01:28.000000000 +0100
629 +++ wxWidgets-2.8.12/src/unix/dialup.cpp 2012-09-30 15:56:29.271240585 +0200
634 - wxLogError(_("Already dialling ISP."));
635 + wxLogError("%s", _("Already dialling ISP."));
639 --- wxWidgets-2.8.12/src/gtk/textctrl.cpp.orig 2011-03-22 13:01:32.000000000 +0100
640 +++ wxWidgets-2.8.12/src/gtk/textctrl.cpp 2012-09-30 16:21:18.987876200 +0200
641 @@ -1015,7 +1015,7 @@
643 // see comment in WriteText() as to why we must warn the user about
645 - wxLogWarning(_("Failed to set text in the text control."));
646 + wxLogWarning("%s", _("Failed to set text in the text control."));
650 @@ -1072,7 +1072,7 @@
651 // we must log an error here as losing the text like this can be a
652 // serious problem (e.g. imagine the document edited by user being
653 // empty instead of containing the correct text)
654 - wxLogWarning(_("Failed to insert text in the control."));
655 + wxLogWarning("%s", _("Failed to insert text in the control."));
659 --- wxWidgets-2.8.12/src/common/docview.cpp.orig 2011-03-22 12:59:40.000000000 +0100
660 +++ wxWidgets-2.8.12/src/common/docview.cpp 2012-09-30 16:43:04.191182329 +0200
665 - wxLogError(_("Sorry, could not open this file."));
666 + wxLogError("%s", _("Sorry, could not open this file."));
670 --- wxWidgets-2.8.12/src/common/fontmap.cpp.orig 2011-03-22 12:59:41.000000000 +0100
671 +++ wxWidgets-2.8.12/src/common/fontmap.cpp 2012-09-30 16:47:20.114510328 +0200
674 if ( encoding == wxFONTENCODING_SYSTEM )
676 - wxLogFatalError(_("can't load any font, aborting"));
677 + wxLogFatalError("%s", _("can't load any font, aborting"));
679 // wxLogFatalError doesn't return