1 --- wxWidgets-2.8.12/src/common/appbase.cpp.orig 2012-10-01 19:41:54.219157836 +0200
2 +++ wxWidgets-2.8.12/src/common/appbase.cpp 2012-10-01 19:43:44.765822198 +0200
5 if ( strcmp(optionsSignature, WX_BUILD_OPTIONS_SIGNATURE) != 0 )
7 - wxString lib = wxString::FromAscii(WX_BUILD_OPTIONS_SIGNATURE);
8 - wxString prog = wxString::FromAscii(optionsSignature);
9 - wxString progName = wxString::FromAscii(componentName);
12 - msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
13 - lib.c_str(), progName.c_str(), prog.c_str());
15 - wxLogFatalError(msg.c_str());
16 + wxLogFatalError(wxT("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."), WX_BUILD_OPTIONS_SIGNATURE, optionsSignature, componentName);
18 // normally wxLogFatalError doesn't return
20 --- wxWidgets-2.8.12/src/common/fs_mem.cpp.orig 2011-03-22 12:59:41.000000000 +0100
21 +++ wxWidgets-2.8.12/src/common/fs_mem.cpp 2012-09-30 10:11:49.745004943 +0200
24 if (m_Hash -> Get(filename) != NULL)
27 - s.Printf(_("Memory VFS already contains file '%s'!"), filename.c_str());
29 + wxLogError(_("Memory VFS already contains file '%s'!"), filename.c_str());
35 m_Hash -> Get(filename) == NULL)
38 - s.Printf(_("Trying to remove file '%s' from memory VFS, but it is not loaded!"), filename.c_str());
40 + wxLogError(_("Trying to remove file '%s' from memory VFS, but it is not loaded!"), filename.c_str());
46 s.Printf(_("Failed to store image '%s' to memory VFS!"), filename.c_str());
47 wxPrintf(wxT("'%s'\n"), s.c_str());
49 + wxLogError(wxT("%s"), s.c_str());
53 --- wxWidgets-2.8.12/utils/wxrc/wxrc.cpp.orig 2011-03-22 13:00:31.000000000 +0100
54 +++ wxWidgets-2.8.12/utils/wxrc/wxrc.cpp 2012-10-01 19:13:05.222527207 +0200
56 for (size_t i = 0; i < parFiles.Count(); i++)
59 - wxPrintf(wxT("processing ") + parFiles[i] + wxT("...\n"));
60 + wxPrintf(wxT("processing %s...\n"), parFiles[i].c_str());
64 if (!doc.Load(parFiles[i]))
66 - wxLogError(wxT("Error parsing file ") + parFiles[i]);
67 + wxLogError(wxT("Error parsing file %s"), parFiles[i].c_str());
72 fullname = inputPath + wxFILE_SEP_PATH + n->GetContent();
75 - wxPrintf(wxT("adding ") + fullname + wxT("...\n"));
76 + wxPrintf(wxT("adding %s...\n"), fullname.c_str());
78 wxString filename = GetInternalFileName(n->GetContent(), flist);
79 n->SetContent(filename);
84 - wxPrintf(wxT("compressing ") + parOutput + wxT("...\n"));
85 + wxPrintf(wxT("compressing %s...\n"), parOutput.c_str());
87 wxString cwd = wxGetCwd();
88 wxSetWorkingDirectory(parOutputPath);
93 - wxPrintf(wxT("creating C++ source file ") + parOutput + wxT("...\n"));
94 + wxPrintf(wxT("creating C++ source file %s...\n"), parOutput.c_str());
102 - wxPrintf(wxT("creating Python source file ") + parOutput + wxT("...\n"));
103 + wxPrintf(wxT("creating Python source file %s...\n"), parOutput.c_str());
107 @@ -839,12 +839,12 @@
108 for (size_t i = 0; i < parFiles.Count(); i++)
111 - wxPrintf(wxT("processing ") + parFiles[i] + wxT("...\n"));
112 + wxPrintf(wxT("processing %s..."), parFiles[i].c_str());
115 if (!doc.Load(parFiles[i]))
117 - wxLogError(wxT("Error parsing file ") + parFiles[i]);
118 + wxLogError(wxT("Error parsing file %s"), parFiles[i].c_str());
122 --- wxWidgets-2.8.12/src/common/file.cpp.orig 2011-03-22 12:59:40.000000000 +0100
123 +++ wxWidgets-2.8.12/src/common/file.cpp 2012-09-30 08:19:02.785145988 +0200
125 if ( chmod( (const char*) m_strTemp.fn_str(), mode) == -1 )
128 - wxLogSysError(_("Failed to set temporary file permissions"));
129 + wxLogSysError(wxT("%s"), _("Failed to set temporary file permissions"));
133 --- wxWidgets-2.8.12/src/common/fileconf.cpp.orig 2011-03-22 12:59:41.000000000 +0100
134 +++ wxWidgets-2.8.12/src/common/fileconf.cpp 2012-09-30 08:20:45.761810510 +0200
137 if ( err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF )
139 - wxLogError(_("Error reading config options."));
140 + wxLogError(wxT("%s"), _("Error reading config options."));
144 @@ -1043,7 +1043,7 @@
146 if ( !file.IsOpened() )
148 - wxLogError(_("can't open user configuration file."));
149 + wxLogError(wxT("%s"), _("can't open user configuration file."));
153 @@ -1057,13 +1057,13 @@
155 if ( !file.Write(filetext, *m_conv) )
157 - wxLogError(_("can't write user configuration file."));
158 + wxLogError(wxT("%s"), _("can't write user configuration file."));
162 if ( !file.Commit() )
164 - wxLogError(_("Failed to update user configuration file."));
165 + wxLogError(wxT("%s"), _("Failed to update user configuration file."));
169 @@ -1090,7 +1090,7 @@
170 wxCharBuffer buf(line.mb_str(conv));
171 if ( !os.Write(buf, strlen(buf)) )
173 - wxLogError(_("Error saving user configuration data."));
174 + wxLogError(wxT("%s"), _("Error saving user configuration data."));
178 --- wxWidgets-2.8.12/src/common/filename.cpp.orig 2011-03-22 12:59:41.000000000 +0100
179 +++ wxWidgets-2.8.12/src/common/filename.cpp 2012-09-30 08:26:13.781803673 +0200
184 - wxLogSysError(_("Failed to create a temporary file name"));
185 + wxLogSysError(wxT("%s"), _("Failed to create a temporary file name"));
190 // fails, though of course it should be protected against
191 // possible infinite looping too.
193 - wxLogError(_("Failed to open temporary file."));
194 + wxLogError(wxT("%s"), _("Failed to open temporary file."));
198 --- wxWidgets-2.8.12/src/common/filefn.cpp.orig 2011-03-22 12:59:41.000000000 +0100
199 +++ wxWidgets-2.8.12/src/common/filefn.cpp 2012-09-30 09:03:28.965090416 +0200
200 @@ -1513,7 +1513,7 @@
204 - wxLogSysError(_("Failed to get the working directory"));
205 + wxLogSysError(wxT("%s"), _("Failed to get the working directory"));
207 // VZ: the old code used to return "." on error which didn't make any
208 // sense at all to me - empty string is a better error indicator
209 --- wxWidgets-2.8.12/src/common/init.cpp.orig 2011-03-22 12:59:41.000000000 +0100
210 +++ wxWidgets-2.8.12/src/common/init.cpp 2012-09-30 09:06:52.951752832 +0200
213 if ( !wxModule::InitializeModules() )
215 - wxLogError(_("Initialization failed in post init, aborting."));
216 + wxLogError(wxT("%s"), _("Initialization failed in post init, aborting."));
220 --- wxWidgets-2.8.12/src/common/stopwatch.cpp.orig 2011-03-22 12:59:42.000000000 +0100
221 +++ wxWidgets-2.8.12/src/common/stopwatch.cpp 2012-09-30 09:13:41.768410978 +0200
223 if (( t0 != (time_t)-1 ) && ( t1 != (time_t)-1 ))
224 return (long)difftime(t1, t0) + (60 * 60 * 24 * 4);
226 - wxLogSysError(_("Failed to get the local system time"));
227 + wxLogSysError(wxT("%s"), _("Failed to get the local system time"));
235 - wxLogError(_("wxGetTimeOfDay failed."));
236 + wxLogError(wxT("%s"), _("wxGetTimeOfDay failed."));
239 #elif defined(HAVE_FTIME)
240 --- wxWidgets-2.8.12/src/common/tarstrm.cpp.orig 2011-03-22 12:59:42.000000000 +0100
241 +++ wxWidgets-2.8.12/src/common/tarstrm.cpp 2012-09-30 09:40:58.075043539 +0200
244 m_hdr->Read(*m_parent_i_stream);
245 if (m_parent_i_stream->Eof())
246 - wxLogError(_("incomplete header block in tar"));
247 + wxLogError(wxT("%s"), _("incomplete header block in tar"));
248 if (!*m_parent_i_stream)
249 return wxSTREAM_READ_ERROR;
250 m_offset += TAR_BLOCKSIZE;
252 if (m_sumType == SUM_SIGNED)
253 ok = chksum == m_hdr->Sum(true);
255 - wxLogError(_("checksum failure reading tar header block"));
256 + wxLogError(wxT("%s"), _("checksum failure reading tar header block"));
257 return wxSTREAM_READ_ERROR;
263 if (!ok || recPos < len || size != lastread) {
264 - wxLogWarning(_("invalid data in extended tar header"));
265 + wxLogWarning(wxT("%s"), _("invalid data in extended tar header"));
270 wxFileOffset wxTarInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
273 - wxLogError(_("tar entry not open"));
274 + wxLogError(wxT("%s"), _("tar entry not open"));
275 m_lasterror = wxSTREAM_READ_ERROR;
278 @@ -1018,7 +1018,7 @@
279 size_t wxTarInputStream::OnSysRead(void *buffer, size_t size)
282 - wxLogError(_("tar entry not open"));
283 + wxLogError(wxT("%s"), _("tar entry not open"));
284 m_lasterror = wxSTREAM_READ_ERROR;
286 if (!IsOk() || !size)
287 @@ -1037,7 +1037,7 @@
288 } else if (!m_parent_i_stream->IsOk()) {
289 // any other error will have been reported by the underlying stream
290 if (m_parent_i_stream->Eof())
291 - wxLogError(_("unexpected end of file"));
292 + wxLogError(wxT("%s"), _("unexpected end of file"));
293 m_lasterror = wxSTREAM_READ_ERROR;
296 @@ -1371,7 +1371,7 @@
299 if (sizePos == wxInvalidOffset || !m_hdr->SetOctal(TAR_SIZE, m_pos)) {
300 - wxLogError(_("incorrect size given for tar entry"));
301 + wxLogError(wxT("%s"), _("incorrect size given for tar entry"));
302 m_lasterror = wxSTREAM_WRITE_ERROR;
305 @@ -1492,7 +1492,7 @@
306 wxFileOffset wxTarOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
309 - wxLogError(_("tar entry not open"));
310 + wxLogError(wxT("%s"), _("tar entry not open"));
311 m_lasterror = wxSTREAM_WRITE_ERROR;
313 if (!IsOk() || m_datapos == wxInvalidOffset)
314 @@ -1514,7 +1514,7 @@
315 size_t wxTarOutputStream::OnSysWrite(const void *buffer, size_t size)
318 - wxLogError(_("tar entry not open"));
319 + wxLogError(wxT("%s"), _("tar entry not open"));
320 m_lasterror = wxSTREAM_WRITE_ERROR;
322 if (!IsOk() || !size)
323 --- wxWidgets-2.8.12/src/common/zstream.cpp.orig 2011-03-22 12:59:43.000000000 +0100
324 +++ wxWidgets-2.8.12/src/common/zstream.cpp 2012-09-30 09:47:40.141701824 +0200
329 - wxLogError(_("Gzip not supported by this version of zlib"));
330 + wxLogError(wxT("%s"), _("Gzip not supported by this version of zlib"));
331 m_lasterror = wxSTREAM_READ_ERROR;
338 - wxLogError(_("Can't initialize zlib inflate stream."));
339 + wxLogError(wxT("%s"), _("Can't initialize zlib inflate stream."));
340 m_lasterror = wxSTREAM_READ_ERROR;
344 m_lasterror = wxSTREAM_EOF;
347 - wxLogError(_("Can't read inflate stream: unexpected EOF in underlying stream."));
348 + wxLogError(wxT("%s"), _("Can't read inflate stream: unexpected EOF in underlying stream."));
354 // if gzip is asked for but not supported...
355 if (flags == wxZLIB_GZIP && !CanHandleGZip()) {
356 - wxLogError(_("Gzip not supported by this version of zlib"));
357 + wxLogError(wxT("%s"), _("Gzip not supported by this version of zlib"));
358 m_lasterror = wxSTREAM_WRITE_ERROR;
365 - wxLogError(_("Can't initialize zlib deflate stream."));
366 + wxLogError(wxT("%s"), _("Can't initialize zlib deflate stream."));
367 m_lasterror = wxSTREAM_WRITE_ERROR;
370 --- wxWidgets-2.8.12/src/common/zipstrm.cpp.orig 2011-03-22 12:59:42.000000000 +0100
371 +++ wxWidgets-2.8.12/src/common/zipstrm.cpp 2012-09-30 09:49:19.005033098 +0200
373 m_parent_o_stream = &stream;
375 if (deflateReset(m_deflate) != Z_OK) {
376 - wxLogError(_("can't re-initialize zlib deflate stream"));
377 + wxLogError(wxT("%s"), _("can't re-initialize zlib deflate stream"));
378 m_lasterror = wxSTREAM_WRITE_ERROR;
382 m_parent_i_stream = &stream;
384 if (inflateReset(m_inflate) != Z_OK) {
385 - wxLogError(_("can't re-initialize zlib inflate stream"));
386 + wxLogError(wxT("%s"), _("can't re-initialize zlib inflate stream"));
387 m_lasterror = wxSTREAM_READ_ERROR;
390 @@ -1269,7 +1269,7 @@
392 if (m_DiskNumber != 0 || m_StartDisk != 0 ||
393 m_EntriesHere != m_TotalEntries)
394 - wxLogWarning(_("assuming this is a multi-part zip concatenated"));
395 + wxLogWarning(wxT("%s"), _("assuming this is a multi-part zip concatenated"));
399 @@ -1441,7 +1441,7 @@
400 // failed, so either this is a non-seekable stream (ok), or not a zip
401 if (m_parentSeekable) {
402 m_lasterror = wxSTREAM_READ_ERROR;
403 - wxLogError(_("invalid zip file"));
404 + wxLogError(wxT("%s"), _("invalid zip file"));
408 @@ -1484,7 +1484,7 @@
412 - wxLogError(_("can't find central directory in zip"));
413 + wxLogError(wxT("%s"), _("can't find central directory in zip"));
414 m_lasterror = wxSTREAM_READ_ERROR;
417 @@ -1570,7 +1570,7 @@
420 if (m_signature != CENTRAL_MAGIC) {
421 - wxLogError(_("error reading zip central directory"));
422 + wxLogError(wxT("%s"), _("error reading zip central directory"));
423 return wxSTREAM_READ_ERROR;
426 @@ -1661,7 +1661,7 @@
430 - wxLogError(_("error reading zip local header"));
431 + wxLogError(wxT("%s"), _("error reading zip local header"));
432 return wxSTREAM_READ_ERROR;
435 @@ -1709,7 +1709,7 @@
438 if (ReadSignature() != LOCAL_MAGIC) {
439 - wxLogError(_("bad zipfile offset to entry"));
440 + wxLogError(wxT("%s"), _("bad zipfile offset to entry"));
444 @@ -1776,7 +1776,7 @@
445 switch (m_entry.GetMethod()) {
446 case wxZIP_METHOD_STORE:
447 if (m_entry.GetSize() == wxInvalidOffset) {
448 - wxLogError(_("stored file length not in Zip header"));
449 + wxLogError(wxT("%s"), _("stored file length not in Zip header"));
452 m_store->Open(m_entry.GetSize());
453 @@ -1790,7 +1790,7 @@
457 - wxLogError(_("unsupported Zip compression method"));
458 + wxLogError(wxT("%s"), _("unsupported Zip compression method"));
462 @@ -2171,7 +2171,7 @@
466 - wxLogError(_("unsupported Zip compression method"));
467 + wxLogError(wxT("%s"), _("unsupported Zip compression method"));
471 --- wxWidgets-2.8.12/include/wx/unix/pipe.h.orig 2011-03-22 13:01:28.000000000 +0100
472 +++ wxWidgets-2.8.12/include/wx/unix/pipe.h 2012-09-30 09:52:41.701695539 +0200
475 if ( pipe(m_fds) == -1 )
477 - wxLogSysError(_("Pipe creation failed"));
478 + wxLogSysError(wxT("%s"), _("Pipe creation failed"));
482 --- wxWidgets-2.8.12/src/unix/baseunix.cpp.orig 2011-03-22 13:01:28.000000000 +0100
483 +++ wxWidgets-2.8.12/src/unix/baseunix.cpp 2012-09-30 09:53:20.938361388 +0200
486 if ( waitpid(execData.pid, &exitcode, 0) == -1 || !WIFEXITED(exitcode) )
488 - wxLogSysError(_("Waiting for subprocess termination failed"));
489 + wxLogSysError(wxT("%s"), _("Waiting for subprocess termination failed"));
493 --- wxWidgets-2.8.12/src/unix/snglinst.cpp.orig 2011-03-22 13:01:28.000000000 +0100
494 +++ wxWidgets-2.8.12/src/unix/snglinst.cpp 2012-09-30 10:01:41.101684296 +0200
496 // another process managed to open and lock the file and terminate
497 // (erasing it) before we got here, but this should happen so
498 // rarely in practice that we don't care
499 - wxLogError(_("Failed to access lock file."));
500 + wxLogError(wxT("%s"), _("Failed to access lock file."));
505 ssize_t count = file.Read(buf, WXSIZEOF(buf));
506 if ( count == wxInvalidOffset )
508 - wxLogError(_("Failed to read PID from lock file."));
509 + wxLogError(wxT("%s"), _("Failed to read PID from lock file."));
513 --- wxWidgets-2.8.12/src/unix/threadpsx.cpp.orig 2011-03-22 13:01:28.000000000 +0100
514 +++ wxWidgets-2.8.12/src/unix/threadpsx.cpp 2012-09-30 10:06:25.185011707 +0200
516 int rc = pthread_setspecific(gs_keySelf, thread);
519 - wxLogSysError(rc, _("Cannot start thread: error writing TLS"));
520 + wxLogSysError(rc, wxT("%s"), _("Cannot start thread: error writing TLS"));
525 // wxLogDebug: it is possible to bring the system to its knees
526 // by creating too many threads and not joining them quite
528 - wxLogError(_("Failed to join a thread, potential memory leak detected - please restart the program"));
529 + wxLogError(wxT("%s"), _("Failed to join a thread, potential memory leak detected - please restart the program"));
532 m_shouldBeJoined = false;
533 @@ -1106,7 +1106,7 @@
535 if ( pthread_attr_getschedpolicy(&attr, &policy) != 0 )
537 - wxLogError(_("Cannot retrieve thread scheduling policy."));
538 + wxLogError(wxT("%s"), _("Cannot retrieve thread scheduling policy."));
542 @@ -1133,7 +1133,7 @@
543 if ( prio != WXTHREAD_DEFAULT_PRIORITY )
545 // notify the programmer that this doesn't work here
546 - wxLogWarning(_("Thread priority setting is ignored."));
547 + wxLogWarning(wxT("%s"), _("Thread priority setting is ignored."));
549 //else: we have default priority, so don't complain
551 @@ -1433,7 +1433,7 @@
552 if ( pthread_cancel(m_internal->GetId()) != 0 )
553 #endif // HAVE_PTHREAD_CANCEL
555 - wxLogError(_("Failed to terminate a thread."));
556 + wxLogError(wxT("%s"), _("Failed to terminate a thread."));
558 return wxTHREAD_MISC_ERROR;
560 @@ -1615,7 +1615,7 @@
561 int rc = pthread_key_create(&gs_keySelf, NULL /* dtor function */);
564 - wxLogSysError(rc, _("Thread module initialization failed: failed to create thread key"));
565 + wxLogSysError(rc, wxT("%s"), _("Thread module initialization failed: failed to create thread key"));
569 --- wxWidgets-2.8.12/src/common/ftp.cpp.orig 2011-03-22 12:59:41.000000000 +0100
570 +++ wxWidgets-2.8.12/src/common/ftp.cpp 2012-09-30 10:18:44.061662974 +0200
572 if ( !sockSrv->WaitForAccept() )
574 m_lastError = wxPROTO_CONNERR;
575 - wxLogError(_("Timeout while waiting for FTP server to connect, try passive mode."));
576 + wxLogError(wxT("%s"), _("Timeout while waiting for FTP server to connect, try passive mode."));
582 m_lastError = wxPROTO_PROTERR;
584 - wxLogError(_("The FTP server doesn't support the PORT command."));
585 + wxLogError(wxT("%s"), _("The FTP server doesn't support the PORT command."));
591 if ( !DoSimpleCommand(_T("PASV")) )
593 - wxLogError(_("The FTP server doesn't support passive mode."));
594 + wxLogError(wxT("%s"), _("The FTP server doesn't support passive mode."));
598 --- wxWidgets-2.8.12/src/unix/utilsunx.cpp.orig 2011-03-22 13:01:28.000000000 +0100
599 +++ wxWidgets-2.8.12/src/unix/utilsunx.cpp 2012-09-30 10:28:09.194984528 +0200
601 switch ( select(fd + 1, &readfds, NULL, NULL, &tv) )
604 - wxLogSysError(_("Impossible to get child process input"));
605 + wxLogSysError(wxT("%s"), _("Impossible to get child process input"));
611 if ( pid == -1 ) // error?
613 - wxLogSysError( _("Fork failed") );
614 + wxLogSysError(wxT("%s"), _("Fork failed") );
619 dup2(pipeOut[wxPipe::Write], STDOUT_FILENO) == -1 ||
620 dup2(pipeErr[wxPipe::Write], STDERR_FILENO) == -1 )
622 - wxLogSysError(_("Failed to redirect child process input/output"));
623 + wxLogSysError(wxT("%s"), _("Failed to redirect child process input/output"));
631 - wxLogSysError(_("Cannot get the hostname"));
632 + wxLogSysError(wxT("%s"), _("Cannot get the hostname"));
637 struct hostent *host = gethostbyname(wxSafeConvertWX2MB(buf));
640 - wxLogSysError(_("Cannot get the official hostname"));
641 + wxLogSysError(wxT("%s"), _("Cannot get the official hostname"));
645 --- wxWidgets-2.8.12/src/common/sckaddr.cpp.orig 2011-03-22 12:59:42.000000000 +0100
646 +++ wxWidgets-2.8.12/src/common/sckaddr.cpp 2012-09-30 10:54:15.261618553 +0200
648 // Some people are sometimes fool.
651 - wxLogWarning( _("Trying to solve a NULL hostname: giving up") );
652 + wxLogWarning(wxT("%s"), _("Trying to solve a NULL hostname: giving up") );
655 m_origHostname = name;
656 --- wxWidgets-2.8.12/src/common/socket.cpp.orig 2011-03-22 12:59:42.000000000 +0100
657 +++ wxWidgets-2.8.12/src/common/socket.cpp 2012-09-30 10:58:04.798280436 +0200
660 if (sig != 0xfeeddead)
662 - wxLogWarning(_("wxSocket: invalid signature in ReadMsg."));
663 + wxLogWarning(wxT("%s"), _("wxSocket: invalid signature in ReadMsg."));
669 if (sig != 0xdeadfeed)
671 - wxLogWarning(_("wxSocket: invalid signature in ReadMsg."));
672 + wxLogWarning(wxT("%s"), _("wxSocket: invalid signature in ReadMsg."));
677 case GSOCK_CONNECTION: flag = GSOCK_CONNECTION_FLAG; break;
678 case GSOCK_LOST: flag = GSOCK_LOST_FLAG; break;
680 - wxLogWarning(_("wxSocket: unknown event!."));
681 + wxLogWarning(wxT("%s"), _("wxSocket: unknown event!."));
685 --- wxWidgets-2.8.12/src/unix/displayx11.cpp.orig 2011-03-22 13:01:28.000000000 +0100
686 +++ wxWidgets-2.8.12/src/unix/displayx11.cpp 2012-09-30 15:55:56.814574597 +0200
691 - wxLogSysError(_("Failed to enumerate video modes"));
692 + wxLogSysError(wxT("%s"), _("Failed to enumerate video modes"));
698 if( !XF86VidModeGetAllModeLines((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()), &nNumModes, &ppXModes) )
700 - wxLogSysError(_("Failed to change video mode"));
701 + wxLogSysError(wxT("%s"), _("Failed to change video mode"));
705 --- wxWidgets-2.8.12/src/unix/dialup.cpp.orig 2011-03-22 13:01:28.000000000 +0100
706 +++ wxWidgets-2.8.12/src/unix/dialup.cpp 2012-09-30 15:56:29.271240585 +0200
711 - wxLogError(_("Already dialling ISP."));
712 + wxLogError(wxT("%s"), _("Already dialling ISP."));
716 --- wxWidgets-2.8.12/src/gtk/textctrl.cpp.orig 2011-03-22 13:01:32.000000000 +0100
717 +++ wxWidgets-2.8.12/src/gtk/textctrl.cpp 2012-09-30 16:21:18.987876200 +0200
718 @@ -1015,7 +1015,7 @@
720 // see comment in WriteText() as to why we must warn the user about
722 - wxLogWarning(_("Failed to set text in the text control."));
723 + wxLogWarning(wxT("%s"), _("Failed to set text in the text control."));
727 @@ -1072,7 +1072,7 @@
728 // we must log an error here as losing the text like this can be a
729 // serious problem (e.g. imagine the document edited by user being
730 // empty instead of containing the correct text)
731 - wxLogWarning(_("Failed to insert text in the control."));
732 + wxLogWarning(wxT("%s"), _("Failed to insert text in the control."));
736 --- wxWidgets-2.8.12/src/common/docview.cpp.orig 2011-03-22 12:59:40.000000000 +0100
737 +++ wxWidgets-2.8.12/src/common/docview.cpp 2012-09-30 16:43:04.191182329 +0200
742 - wxLogError(_("Sorry, could not open this file."));
743 + wxLogError(wxT("%s"), _("Sorry, could not open this file."));
747 --- wxWidgets-2.8.12/src/common/fontmap.cpp.orig 2011-03-22 12:59:41.000000000 +0100
748 +++ wxWidgets-2.8.12/src/common/fontmap.cpp 2012-09-30 16:47:20.114510328 +0200
751 if ( encoding == wxFONTENCODING_SYSTEM )
753 - wxLogFatalError(_("can't load any font, aborting"));
754 + wxLogFatalError(wxT("%s"), _("can't load any font, aborting"));
756 // wxLogFatalError doesn't return
758 --- wxWidgets-2.8.12/src/common/imagbmp.cpp.orig 2011-03-22 12:59:41.000000000 +0100
759 +++ wxWidgets-2.8.12/src/common/imagbmp.cpp 2012-09-30 16:57:19.711164497 +0200
764 - wxLogError(_("BMP: Couldn't save invalid image."));
765 + wxLogError(wxT("%s"), _("BMP: Couldn't save invalid image."));
773 - wxLogError(_("BMP: wxImage doesn't have own wxPalette."));
774 + wxLogError(wxT("%s"), _("BMP: wxImage doesn't have own wxPalette."));
782 - wxLogError(_("BMP: Couldn't write the file (Bitmap) header."));
783 + wxLogError(wxT("%s"), _("BMP: Couldn't write the file (Bitmap) header."));
791 - wxLogError(_("BMP: Couldn't write the file (BitmapInfo) header."));
792 + wxLogError(wxT("%s"), _("BMP: Couldn't write the file (BitmapInfo) header."));
797 if ( !stream.Write(rgbquad, palette_size*4) )
800 - wxLogError(_("BMP: Couldn't write RGB color map."));
801 + wxLogError(wxT("%s"), _("BMP: Couldn't write RGB color map."));
806 if ( !stream.Write(buffer, row_width) )
809 - wxLogError(_("BMP: Couldn't write data."));
810 + wxLogError(wxT("%s"), _("BMP: Couldn't write data."));
818 - wxLogError(_("BMP: Couldn't allocate memory."));
819 + wxLogError(wxT("%s"), _("BMP: Couldn't allocate memory."));
827 - wxLogError( _("BMP: Couldn't allocate memory.") );
828 + wxLogError(wxT("%s"), _("BMP: Couldn't allocate memory.") );
836 - wxLogError(_("BMP: Couldn't allocate memory."));
837 + wxLogError(wxT("%s"), _("BMP: Couldn't allocate memory."));
841 @@ -898,13 +898,13 @@
845 - wxLogError( _("DIB Header: Image width > 32767 pixels for file.") );
846 + wxLogError(wxT("%s"), _("DIB Header: Image width > 32767 pixels for file.") );
849 if ( height > 32767 )
852 - wxLogError( _("DIB Header: Image height > 32767 pixels for file.") );
853 + wxLogError(wxT("%s"), _("DIB Header: Image height > 32767 pixels for file.") );
858 if ( bpp != 1 && bpp != 4 && bpp != 8 && bpp != 16 && bpp != 24 && bpp != 32 )
861 - wxLogError( _("DIB Header: Unknown bitdepth in file.") );
862 + wxLogError(wxT("%s"), _("DIB Header: Unknown bitdepth in file.") );
867 comp != BI_BITFIELDS )
870 - wxLogError( _("DIB Header: Unknown encoding in file.") );
871 + wxLogError(wxT("%s"), _("DIB Header: Unknown encoding in file.") );
876 ((comp == BI_BITFIELDS) && (bpp != 16 && bpp != 32)))
879 - wxLogError( _("DIB Header: Encoding doesn't match bitdepth.") );
880 + wxLogError(wxT("%s"), _("DIB Header: Encoding doesn't match bitdepth.") );
885 verbose, IsBmp, true) )
888 - wxLogError( _("Error in reading image DIB.") );
889 + wxLogError(wxT("%s"), _("Error in reading image DIB.") );
894 verbose, IsBmp, false) )
897 - wxLogError( _("ICO: Error in reading mask DIB.") );
898 + wxLogError(wxT("%s"), _("ICO: Error in reading mask DIB.") );
901 image->SetMaskFromImage(mask, 255, 255, 255);
902 @@ -1037,13 +1037,13 @@
903 if ( image->GetHeight () > 127 )
906 - wxLogError(_("ICO: Image too tall for an icon."));
907 + wxLogError(wxT("%s"), _("ICO: Image too tall for an icon."));
910 if ( image->GetWidth () > 255 )
913 - wxLogError(_("ICO: Image too wide for an icon."));
914 + wxLogError(wxT("%s"), _("ICO: Image too wide for an icon."));
918 @@ -1069,7 +1069,7 @@
919 if ( !stream.IsOk() )
922 - wxLogError(_("ICO: Error writing the image file!"));
923 + wxLogError(wxT("%s"), _("ICO: Error writing the image file!"));
927 @@ -1128,7 +1128,7 @@
931 - wxLogError(_("ICO: Error writing the image file!"));
932 + wxLogError(wxT("%s"), _("ICO: Error writing the image file!"));
936 @@ -1137,7 +1137,7 @@
940 - wxLogError(_("ICO: Error writing the image file!"));
941 + wxLogError(wxT("%s"), _("ICO: Error writing the image file!"));
944 wxUint32 Size = cStream.GetSize();
945 @@ -1192,7 +1192,7 @@
946 if ( !stream.IsOk() )
949 - wxLogError(_("ICO: Error writing the image file!"));
950 + wxLogError(wxT("%s"), _("ICO: Error writing the image file!"));
954 @@ -1202,7 +1202,7 @@
958 - wxLogError(_("ICO: Error writing the image file!"));
959 + wxLogError(wxT("%s"), _("ICO: Error writing the image file!"));
963 @@ -1211,7 +1211,7 @@
967 - wxLogError(_("ICO: Error writing the image file!"));
968 + wxLogError(wxT("%s"), _("ICO: Error writing the image file!"));
972 @@ -1276,7 +1276,7 @@
974 if ( iSel == wxNOT_FOUND || iSel < 0 || iSel >= nIcons )
976 - wxLogError(_("ICO: Invalid icon index."));
977 + wxLogError(wxT("%s"), _("ICO: Invalid icon index."));
981 --- wxWidgets-2.8.12/src/common/image.cpp.orig 2011-03-22 12:59:41.000000000 +0100
982 +++ wxWidgets-2.8.12/src/common/image.cpp 2012-09-30 16:59:23.204495257 +0200
983 @@ -1842,7 +1842,7 @@
984 // check that the images are the same size
985 if ( (M_IMGDATA->m_height != mask.GetHeight() ) || (M_IMGDATA->m_width != mask.GetWidth () ) )
987 - wxLogError( _("Image and mask have different sizes.") );
988 + wxLogError(wxT("%s"), _("Image and mask have different sizes.") );
992 @@ -1850,7 +1850,7 @@
993 unsigned char r,g,b ;
994 if (!FindFirstUnusedColour(&r, &g, &b))
996 - wxLogError( _("No unused colour in image being masked.") );
997 + wxLogError(wxT("%s"), _("No unused colour in image being masked.") );
1001 @@ -1891,7 +1891,7 @@
1002 unsigned char mr, mg, mb;
1003 if (!FindFirstUnusedColour(&mr, &mg, &mb))
1005 - wxLogError( _("No unused colour in image being masked.") );
1006 + wxLogError(wxT("%s"), _("No unused colour in image being masked.") );
1010 @@ -2172,7 +2172,7 @@
1014 - wxLogWarning(_("No handler found for image type."));
1015 + wxLogWarning(wxT("%s"), _("No handler found for image type."));
1019 @@ -2215,7 +2215,7 @@
1023 - wxLogWarning( _("No handler found for image type.") );
1024 + wxLogWarning(wxT("%s"), _("No handler found for image type.") );
1028 @@ -2696,7 +2696,7 @@
1032 - wxLogError(_("No unused colour in image.") );
1033 + wxLogError(wxT("%s"),_("No unused colour in image.") );
1037 --- wxWidgets-2.8.12/src/common/imaggif.cpp.orig 2011-03-22 12:59:41.000000000 +0100
1038 +++ wxWidgets-2.8.12/src/common/imaggif.cpp 2012-09-30 17:04:34.731155430 +0200
1042 case wxGIF_INVFORMAT:
1043 - wxLogError(_("GIF: error in GIF image format."));
1044 + wxLogError(wxT("%s"), _("GIF: error in GIF image format."));
1047 - wxLogError(_("GIF: not enough memory."));
1048 + wxLogError(wxT("%s"), _("GIF: not enough memory."));
1051 - wxLogError(_("GIF: unknown error!!!"));
1052 + wxLogError(wxT("%s"), _("GIF: unknown error!!!"));
1058 if ((error == wxGIF_TRUNCATED) && verbose)
1060 - wxLogError(_("GIF: data stream seems to be truncated."));
1061 + wxLogError(wxT("%s"), _("GIF: data stream seems to be truncated."));
1062 /* go on; image data is OK */
1069 - wxLogError(_("GIF: Invalid gif index."));
1070 + wxLogError(wxT("%s"), _("GIF: Invalid gif index."));
1074 --- wxWidgets-2.8.12/src/common/imagjpeg.cpp.orig 2011-03-22 12:59:41.000000000 +0100
1075 +++ wxWidgets-2.8.12/src/common/imagjpeg.cpp 2012-09-30 18:17:01.807731491 +0200
1077 * We need to clean up the JPEG object, close the input file, and return.
1080 - wxLogError(_("JPEG: Couldn't load - file is probably corrupted."));
1081 + wxLogError(wxT("%s"), _("JPEG: Couldn't load - file is probably corrupted."));
1082 (cinfo.src->term_source)(&cinfo);
1083 jpeg_destroy_decompress(&cinfo);
1084 if (image->Ok()) image->Destroy();
1086 * We need to clean up the JPEG object, close the input file, and return.
1089 - wxLogError(_("JPEG: Couldn't save image."));
1090 + wxLogError(wxT("%s"), _("JPEG: Couldn't save image."));
1091 jpeg_destroy_compress(&cinfo);
1094 --- wxWidgets-2.8.12/src/common/imagpcx.cpp.orig 2011-03-22 12:59:41.000000000 +0100
1095 +++ wxWidgets-2.8.12/src/common/imagpcx.cpp 2012-09-30 18:19:28.711061763 +0200
1097 if (!CanRead(stream))
1100 - wxLogError(_("PCX: this is not a PCX file."));
1101 + wxLogError(wxT("%s"), _("PCX: this is not a PCX file."));
1105 @@ -452,10 +452,10 @@
1109 - case wxPCX_INVFORMAT: wxLogError(_("PCX: image format unsupported")); break;
1110 - case wxPCX_MEMERR: wxLogError(_("PCX: couldn't allocate memory")); break;
1111 - case wxPCX_VERERR: wxLogError(_("PCX: version number too low")); break;
1112 - default: wxLogError(_("PCX: unknown error !!!"));
1113 + case wxPCX_INVFORMAT: wxLogError(wxT("%s"), _("PCX: image format unsupported")); break;
1114 + case wxPCX_MEMERR: wxLogError(wxT("%s"), _("PCX: couldn't allocate memory")); break;
1115 + case wxPCX_VERERR: wxLogError(wxT("%s"), _("PCX: version number too low")); break;
1116 + default: wxLogError(wxT("%s"), _("PCX: unknown error !!!"));
1124 - case wxPCX_INVFORMAT: wxLogError(_("PCX: invalid image")); break;
1125 - case wxPCX_MEMERR: wxLogError(_("PCX: couldn't allocate memory")); break;
1126 - default: wxLogError(_("PCX: unknown error !!!"));
1127 + case wxPCX_INVFORMAT: wxLogError(wxT("%s"), _("PCX: invalid image")); break;
1128 + case wxPCX_MEMERR: wxLogError(wxT("%s"), _("PCX: couldn't allocate memory")); break;
1129 + default: wxLogError(wxT("%s"), _("PCX: unknown error !!!"));
1133 --- wxWidgets-2.8.12/src/common/imagpng.cpp.orig 2011-03-22 12:59:41.000000000 +0100
1134 +++ wxWidgets-2.8.12/src/common/imagpng.cpp 2012-09-30 18:21:56.457725349 +0200
1137 wxPNGInfoStruct *info = png_ptr ? WX_PNG_INFO(png_ptr) : NULL;
1138 if ( !info || info->verbose )
1139 - wxLogWarning( wxString::FromAscii(message) );
1140 + wxLogWarning(wxT("%s"), message );
1146 if ( !h.FindFirstUnusedColour(&rMask, &gMask, &bMask) )
1148 - wxLogWarning(_("Too many colours in PNG, the image may be slightly blurred."));
1149 + wxLogWarning(wxT("%s"), _("Too many colours in PNG, the image may be slightly blurred."));
1151 // use a fixed mask colour and we'll fudge
1152 // the real pixels with this colour (see
1157 - wxLogError(_("Couldn't load a PNG image - file is corrupted or not enough memory."));
1158 + wxLogError(wxT("%s"), _("Couldn't load a PNG image - file is corrupted or not enough memory."));
1166 - wxLogError(_("Couldn't save PNG image."));
1167 + wxLogError(wxT("%s"), _("Couldn't save PNG image."));
1173 png_destroy_write_struct( &png_ptr, (png_infopp)NULL );
1175 - wxLogError(_("Couldn't save PNG image."));
1176 + wxLogError(wxT("%s"), _("Couldn't save PNG image."));
1182 png_destroy_write_struct( &png_ptr, (png_infopp)NULL );
1184 - wxLogError(_("Couldn't save PNG image."));
1185 + wxLogError(wxT("%s"), _("Couldn't save PNG image."));
1189 --- wxWidgets-2.8.12/src/common/imagpnm.cpp.orig 2011-03-22 12:59:41.000000000 +0100
1190 +++ wxWidgets-2.8.12/src/common/imagpnm.cpp 2012-09-30 18:26:48.461052596 +0200
1192 case wxT('5'): // RAW Grey
1193 case wxT('6'): break;
1195 - if (verbose) wxLogError(_("PNM: File format is not recognized."));
1196 + if (verbose) wxLogError(wxT("%s"), _("PNM: File format is not recognized."));
1204 - wxLogError( _("PNM: Couldn't allocate memory.") );
1205 + wxLogError(wxT("%s"), _("PNM: Couldn't allocate memory.") );
1210 *ptr++=(unsigned char)value; // B
1213 - if (verbose) wxLogError(_("PNM: File seems truncated."));
1214 + if (verbose) wxLogError(wxT("%s"), _("PNM: File seems truncated."));
1222 - if (verbose) wxLogError(_("PNM: File seems truncated."));
1223 + if (verbose) wxLogError(wxT("%s"), _("PNM: File seems truncated."));
1231 - if (verbose) wxLogError(_("PNM: File seems truncated."));
1232 + if (verbose) wxLogError(wxT("%s"), _("PNM: File seems truncated."));
1236 --- wxWidgets-2.8.12/src/common/imagtiff.cpp.orig 2011-03-22 12:59:41.000000000 +0100
1237 +++ wxWidgets-2.8.12/src/common/imagtiff.cpp 2012-09-30 18:35:21.521041902 +0200
1242 - wxLogError( _("TIFF: Error loading image.") );
1243 + wxLogError(wxT("%s"), _("TIFF: Error loading image.") );
1248 if (!TIFFSetDirectory( tif, (tdir_t)index ))
1251 - wxLogError( _("Invalid TIFF image index.") );
1252 + wxLogError(wxT("%s"), _("Invalid TIFF image index.") );
1257 if ( bytesNeeded >= 4294967295U /* UINT32_MAX */ )
1260 - wxLogError( _("TIFF: Image size is abnormally big.") );
1261 + wxLogError(wxT("%s"), _("TIFF: Image size is abnormally big.") );
1269 - wxLogError( _("TIFF: Couldn't allocate memory.") );
1270 + wxLogError(wxT("%s"), _("TIFF: Couldn't allocate memory.") );
1278 - wxLogError( _("TIFF: Couldn't allocate memory.") );
1279 + wxLogError(wxT("%s"), _("TIFF: Couldn't allocate memory.") );
1281 _TIFFfree( raster );
1284 if (!TIFFReadRGBAImage( tif, w, h, raster, 0 ))
1287 - wxLogError( _("TIFF: Error reading image.") );
1288 + wxLogError(wxT("%s"), _("TIFF: Error reading image.") );
1290 _TIFFfree( raster );
1296 - wxLogError( _("TIFF: Error saving image.") );
1297 + wxLogError(wxT("%s"), _("TIFF: Error saving image.") );
1305 - wxLogError( _("TIFF: Couldn't allocate memory.") );
1306 + wxLogError(wxT("%s"), _("TIFF: Couldn't allocate memory.") );
1311 if ( TIFFWriteScanline(tif, buf ? buf : ptr, (uint32)row, 0) < 0 )
1314 - wxLogError( _("TIFF: Error writing image.") );
1315 + wxLogError(wxT("%s"), _("TIFF: Error writing image.") );
1319 --- wxWidgets-2.8.12/src/common/textcmn.cpp.orig 2011-03-22 12:59:42.000000000 +0100
1320 +++ wxWidgets-2.8.12/src/common/textcmn.cpp 2012-09-30 18:39:49.751036311 +0200
1325 - wxLogError(_("File couldn't be loaded."));
1326 + wxLogError(wxT("%s"), _("File couldn't be loaded."));
1327 #endif // wxUSE_FFILE
1332 #endif // wxUSE_FFILE
1334 - wxLogError(_("The text couldn't be saved."));
1335 + wxLogError(wxT("%s"), _("The text couldn't be saved."));
1339 --- wxWidgets-2.8.12/src/common/wincmn.cpp.orig 2011-03-22 12:59:42.000000000 +0100
1340 +++ wxWidgets-2.8.12/src/common/wincmn.cpp 2012-09-30 18:43:17.657698645 +0200
1341 @@ -1552,7 +1552,7 @@
1342 wxValidator *validator = child->GetValidator();
1343 if ( validator && !validator->TransferToWindow() )
1345 - wxLogWarning(_("Could not transfer data to window"));
1346 + wxLogWarning(wxT("%s"), _("Could not transfer data to window"));
1348 wxLog::FlushActive();
1350 --- wxWidgets-2.8.12/src/common/xpmdecod.cpp.orig 2011-03-22 12:59:42.000000000 +0100
1351 +++ wxWidgets-2.8.12/src/common/xpmdecod.cpp 2012-09-30 18:44:05.621030978 +0200
1353 &width, &height, &colors_cnt, &chars_per_pixel);
1354 if ( count != 4 || width * height * colors_cnt == 0 )
1356 - wxLogError(_("XPM: incorrect header format!"));
1357 + wxLogError(wxT("%s"), _("XPM: incorrect header format!"));
1362 entry = clr_tbl.find(key);
1365 - wxLogError(_("XPM: Malformed pixel data!"));
1366 + wxLogError(wxT("%s"), _("XPM: Malformed pixel data!"));
1368 // better return right now as otherwise we risk to flood the
1369 // user with error messages as something seems to be seriously
1370 --- wxWidgets-2.8.12/src/generic/dcpsg.cpp.orig 2011-03-22 12:59:43.000000000 +0100
1371 +++ wxWidgets-2.8.12/src/generic/dcpsg.cpp 2012-09-30 18:47:32.884359991 +0200
1372 @@ -1583,7 +1583,7 @@
1376 - wxLogError( _("Cannot open file for PostScript printing!"));
1377 + wxLogError(wxT("%s"), _("Cannot open file for PostScript printing!"));
1381 --- wxWidgets-2.8.12/src/generic/logg.cpp.orig 2011-03-22 12:59:43.000000000 +0100
1382 +++ wxWidgets-2.8.12/src/generic/logg.cpp 2012-09-30 19:07:07.851002168 +0200
1387 - wxLogError(_("Can't save log contents to file."));
1388 + wxLogError(wxT("%s"), _("Can't save log contents to file."));
1391 wxLogStatus(this, _("Log saved to the file '%s'."), filename.c_str());
1392 @@ -1023,7 +1023,7 @@
1396 - wxLogError(_("Can't save log contents to file."));
1397 + wxLogError(wxT("%s"), _("Can't save log contents to file."));
1398 #endif // wxUSE_FILEDLG
1401 --- wxWidgets-2.8.12/src/generic/printps.cpp.orig 2011-03-22 12:59:43.000000000 +0100
1402 +++ wxWidgets-2.8.12/src/generic/printps.cpp 2012-09-30 19:41:36.954292375 +0200
1404 if (!printout->OnBeginDocument(m_printDialogData.GetFromPage(), m_printDialogData.GetToPage()))
1407 - wxLogError(_("Could not start printing."));
1408 + wxLogError(wxT("%s"), _("Could not start printing."));
1409 sm_lastError = wxPRINTER_ERROR;
1412 --- wxWidgets-2.8.12/src/unix/sound.cpp.orig 2011-03-22 13:01:28.000000000 +0100
1413 +++ wxWidgets-2.8.12/src/unix/sound.cpp 2012-09-30 20:03:09.254265441 +0200
1416 if (!LoadWAV(data, size, true))
1418 - wxLogError(_("Sound data are in unsupported format."));
1419 + wxLogError(wxT("%s"), _("Sound data are in unsupported format."));
1423 --- wxWidgets-2.8.12/src/html/chm.cpp.orig 2011-03-22 12:59:44.000000000 +0100
1424 +++ wxWidgets-2.8.12/src/html/chm.cpp 2012-09-30 20:31:12.494230355 +0200
1427 if ( GetProtocol(left) != _T("file") )
1429 - wxLogError(_("CHM handler currently supports only local files!"));
1430 + wxLogError(wxT("%s"), _("CHM handler currently supports only local files!"));
1435 if ( (index=right.Index(_T("//"))) != wxNOT_FOUND )
1437 right=wxString(right.Mid(index+1));
1438 - wxLogWarning(_("Link contained '//', converted to absolute link."));
1439 + wxLogWarning(wxT("%s"), _("Link contained '//', converted to absolute link."));
1442 wxFileName leftFilename = wxFileSystem::URLToFileName(left);
1445 if ( GetProtocol(left) != _T("file") )
1447 - wxLogError(_("CHM handler currently supports only local files!"));
1448 + wxLogError(wxT("%s"), _("CHM handler currently supports only local files!"));
1449 return wxEmptyString;
1452 --- wxWidgets-2.8.12/src/html/helpwnd.cpp.orig 2011-03-22 12:59:44.000000000 +0100
1453 +++ wxWidgets-2.8.12/src/html/helpwnd.cpp 2012-09-30 20:54:46.604200882 +0200
1454 @@ -1553,7 +1553,7 @@
1455 if (m_Printer == NULL)
1456 m_Printer = new wxHtmlEasyPrinting(_("Help Printing"), this);
1457 if (!m_HtmlWin->GetOpenedPage())
1458 - wxLogWarning(_("Cannot print empty page."));
1459 + wxLogWarning(wxT("%s"), _("Cannot print empty page."));
1461 m_Printer->PrintFile(m_HtmlWin->GetOpenedPage());
1463 --- wxWidgets-2.8.12/src/html/htmlpars.cpp.orig 2011-03-22 12:59:44.000000000 +0100
1464 +++ wxWidgets-2.8.12/src/html/htmlpars.cpp 2012-09-30 20:58:05.014196745 +0200
1466 #endif // wxUSE_STL/!wxUSE_STL
1469 - wxLogWarning(_("Warning: attempt to remove HTML tag handler from empty stack."));
1470 + wxLogWarning(wxT("%s"), _("Warning: attempt to remove HTML tag handler from empty stack."));
1473 m_HandlersHash = *((wxHashTable*) first->GetData());
1474 --- wxWidgets-2.8.12/src/html/htmprint.cpp.orig 2011-03-22 12:59:44.000000000 +0100
1475 +++ wxWidgets-2.8.12/src/html/htmprint.cpp 2012-09-30 21:01:26.160859220 +0200
1480 - wxLogError(htmlfile + _(": file does not exist!"));
1481 + wxLogError(wxT("%s"), (htmlfile + _(": file does not exist!")).c_str());
1487 if (!GetPrintData()->Ok())
1489 - wxLogError(_("There was a problem during page setup: you may need to set a default printer."));
1490 + wxLogError(wxT("%s"), _("There was a problem during page setup: you may need to set a default printer."));
1494 --- wxWidgets-2.8.12/src/common/debugrpt.cpp.orig 2011-03-22 12:59:40.000000000 +0100
1495 +++ wxWidgets-2.8.12/src/common/debugrpt.cpp 2012-09-30 21:10:30.830847867 +0200
1497 if ( !wxMkdir(m_dir, 0700) )
1499 wxLogSysError(_("Failed to create directory \"%s\""), m_dir.c_str());
1500 - wxLogError(_("Debug report couldn't be created."));
1501 + wxLogError(wxT("%s"), _("Debug report couldn't be created."));
1507 if ( !GetFilesCount() )
1509 - wxLogError(_("Debug report generation has failed."));
1510 + wxLogError(wxT("%s"), _("Debug report generation has failed."));
1518 - wxLogError(_("Failed to execute curl, please install it in PATH."));
1519 + wxLogError(wxT("%s"), _("Failed to execute curl, please install it in PATH."));
1523 --- wxWidgets-2.8.12/src/xrc/xh_statbar.cpp.orig 2011-03-22 13:00:29.000000000 +0100
1524 +++ wxWidgets-2.8.12/src/xrc/xh_statbar.cpp 2012-10-01 18:20:53.155925824 +0200
1526 else if (first == wxT("wxSB_RAISED"))
1527 style[i] = wxSB_RAISED;
1528 else if (!first.empty())
1529 - wxLogError(wxT("Error in resource, unknown statusbar field style: ") + first);
1530 + wxLogError(wxT("%s"), (wxT("Error in resource, unknown statusbar field style: ") + first).c_str());
1532 if(styles.Find(wxT(',')))
1533 styles.Remove(0, styles.Find(wxT(',')) + 1);
1534 --- wxWidgets-2.8.12/src/xrc/xmlres.cpp.orig 2011-03-22 13:00:29.000000000 +0100
1535 +++ wxWidgets-2.8.12/src/xrc/xmlres.cpp 2012-10-01 18:38:22.405903953 +0200
1537 m_version = version;
1538 if (m_version != version)
1540 - wxLogError(_("Resource files must have same version number!"));
1541 + wxLogError(wxT("%s"), _("Resource files must have same version number!"));
1546 if (index != wxNOT_FOUND)
1547 style |= m_styleValues[index];
1549 - wxLogError(_("Unknown style flag ") + fl);
1550 + wxLogError(wxT("%s"), (_("Unknown style flag ") + fl).c_str());
1554 @@ -1268,7 +1268,7 @@
1558 - wxLogError(_("Cannot convert dialog units: dialog unknown."));
1559 + wxLogError(wxT("%s"), _("Cannot convert dialog units: dialog unknown."));
1560 return wxDefaultSize;
1563 @@ -1316,7 +1316,7 @@
1567 - wxLogError(_("Cannot convert dialog units: dialog unknown."));
1568 + wxLogError(wxT("%s"), _("Cannot convert dialog units: dialog unknown."));
1572 --- wxWidgets-2.8.12/src/richtext/richtextctrl.cpp.orig 2011-03-22 12:59:44.000000000 +0100
1573 +++ wxWidgets-2.8.12/src/richtext/richtextctrl.cpp 2012-10-01 18:56:32.329214568 +0200
1574 @@ -2135,7 +2135,7 @@
1578 - wxLogError(_("File couldn't be loaded."));
1579 + wxLogError(wxT("%s"), _("File couldn't be loaded."));
1583 @@ -2152,7 +2152,7 @@
1587 - wxLogError(_("The text couldn't be saved."));
1588 + wxLogError(wxT("%s"), _("The text couldn't be saved."));
1592 --- wxWidgets-2.8.12/src/richtext/richtextprint.cpp.orig 2011-03-22 12:59:44.000000000 +0100
1593 +++ wxWidgets-2.8.12/src/richtext/richtextprint.cpp 2012-10-01 19:03:12.205872900 +0200
1596 if (!GetPrintData()->Ok())
1598 - wxLogError(_("There was a problem during page setup: you may need to set a default printer."));
1599 + wxLogError(wxT("%s"), _("There was a problem during page setup: you may need to set a default printer."));
1603 --- wxWidgets-2.8.12/src/x11/app.cpp.orig 2011-03-22 13:01:37.000000000 +0100
1604 +++ wxWidgets-2.8.12/src/x11/app.cpp 2012-10-01 21:27:19.175692671 +0200
1606 // open and set up the X11 display
1607 if ( !wxSetDisplay(displayName) )
1609 - wxLogError(_("wxWidgets could not open display. Exiting."));
1610 + wxLogError(wxT("%s"), _("wxWidgets could not open display. Exiting."));