]> git.pld-linux.org Git - packages/wxWidgets.git/blame - wxWidgets-format.patch
projects / packages / wxWidgets.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- more install time dependensies
[packages/wxWidgets.git] / wxWidgets-format.patch
CommitLineData
13bfeda7
JB		 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
3@@ -416,15 +416,7 @@
c885e705 4
13bfeda7
JB		 5 if ( strcmp(optionsSignature, WX_BUILD_OPTIONS_SIGNATURE) != 0 )
6 {
7- wxString lib = wxString::FromAscii(WX_BUILD_OPTIONS_SIGNATURE);
8- wxString prog = wxString::FromAscii(optionsSignature);
9- wxString progName = wxString::FromAscii(componentName);
10- wxString msg;
11-
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());
14-
c885e705 15- wxLogFatalError(msg.c_str());
3762fb0b 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);
c885e705
JB		 17
18 // normally wxLogFatalError doesn't return
19 return false;
47151347
JB		 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
22@@ -174,9 +174,7 @@
23
24 if (m_Hash -> Get(filename) != NULL)
25 {
26- wxString s;
27- s.Printf(_("Memory VFS already contains file '%s'!"), filename.c_str());
28- wxLogError(s);
29+ wxLogError(_("Memory VFS already contains file '%s'!"), filename.c_str());
30 return false;
31 }
32 else
33@@ -226,9 +224,7 @@
34 if (m_Hash == NULL ||
35 m_Hash -> Get(filename) == NULL)
36 {
37- wxString s;
38- s.Printf(_("Trying to remove file '%s' from memory VFS, but it is not loaded!"), filename.c_str());
39- wxLogError(s);
40+ wxLogError(_("Trying to remove file '%s' from memory VFS, but it is not loaded!"), filename.c_str());
41 }
42
43 else
91433879
JB		 44@@ -261,7 +261,7 @@
45 wxString s;
46 s.Printf(_("Failed to store image '%s' to memory VFS!"), filename.c_str());
47 wxPrintf(wxT("'%s'\n"), s.c_str());
48- wxLogError(s);
609ec907 49+ wxLogError(wxT("%s"), s.c_str());
91433879
JB		 50 }
51 }
52
200f5aab
JB		 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
55@@ -391,13 +391,13 @@
56 for (size_t i = 0; i < parFiles.Count(); i++)
57 {
58 if (flagVerbose)
59- wxPrintf(wxT("processing ") + parFiles[i] + wxT("...\n"));
d5ff851e 60+ wxPrintf(wxT("processing %s...\n"), parFiles[i].c_str());
200f5aab
JB		 61
62 wxXmlDocument doc;
63
64 if (!doc.Load(parFiles[i]))
65 {
66- wxLogError(wxT("Error parsing file ") + parFiles[i]);
609ec907 67+ wxLogError(wxT("Error parsing file %s"), parFiles[i].c_str());
200f5aab
JB		 68 retCode = 1;
69 continue;
70 }
71@@ -497,7 +497,7 @@
72 fullname = inputPath + wxFILE_SEP_PATH + n->GetContent();
73
74 if (flagVerbose)
75- wxPrintf(wxT("adding ") + fullname + wxT("...\n"));
d5ff851e 76+ wxPrintf(wxT("adding %s...\n"), fullname.c_str());
200f5aab
JB		 77
78 wxString filename = GetInternalFileName(n->GetContent(), flist);
79 n->SetContent(filename);
80@@ -537,7 +537,7 @@
81 files.RemoveLast();
82
83 if (flagVerbose)
84- wxPrintf(wxT("compressing ") + parOutput + wxT("...\n"));
d5ff851e 85+ wxPrintf(wxT("compressing %s...\n"), parOutput.c_str());
200f5aab
JB		 86
87 wxString cwd = wxGetCwd();
88 wxSetWorkingDirectory(parOutputPath);
89@@ -604,7 +604,7 @@
90 size_t i;
91
92 if (flagVerbose)
93- wxPrintf(wxT("creating C++ source file ") + parOutput + wxT("...\n"));
d5ff851e 94+ wxPrintf(wxT("creating C++ source file %s...\n"), parOutput.c_str());
200f5aab
JB		 95
96 file.Write(wxT("")
97 wxT("//\n")
98@@ -764,7 +764,7 @@
99 size_t i;
100
101 if (flagVerbose)
102- wxPrintf(wxT("creating Python source file ") + parOutput + wxT("...\n"));
d5ff851e 103+ wxPrintf(wxT("creating Python source file %s...\n"), parOutput.c_str());
200f5aab
JB		 104
105 file.Write(
106 wxT("#\n")
107@@ -839,12 +839,12 @@
108 for (size_t i = 0; i < parFiles.Count(); i++)
109 {
110 if (flagVerbose)
111- wxPrintf(wxT("processing ") + parFiles[i] + wxT("...\n"));
d5ff851e 112+ wxPrintf(wxT("processing %s..."), parFiles[i].c_str());
200f5aab
JB		 113
114 wxXmlDocument doc;
115 if (!doc.Load(parFiles[i]))
116 {
117- wxLogError(wxT("Error parsing file ") + parFiles[i]);
609ec907 118+ wxLogError(wxT("Error parsing file %s"), parFiles[i].c_str());
200f5aab
JB		 119 retCode = 1;
120 continue;
121 }
b44bd5fb
JB		 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
124@@ -513,7 +513,7 @@
125 if ( chmod( (const char*) m_strTemp.fn_str(), mode) == -1 )
126 {
127 #ifndef __OS2__
128- wxLogSysError(_("Failed to set temporary file permissions"));
609ec907 129+ wxLogSysError(wxT("%s"), _("Failed to set temporary file permissions"));
b44bd5fb
JB		 130 #endif
131 }
132 #endif // Unix
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
135@@ -508,7 +508,7 @@
136
137 if ( err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF )
138 {
139- wxLogError(_("Error reading config options."));
609ec907 140+ wxLogError(wxT("%s"), _("Error reading config options."));
b44bd5fb
JB		 141 break;
142 }
143 }
144@@ -1043,7 +1043,7 @@
145
146 if ( !file.IsOpened() )
147 {
148- wxLogError(_("can't open user configuration file."));
609ec907 149+ wxLogError(wxT("%s"), _("can't open user configuration file."));
b44bd5fb
JB		 150 return false;
151 }
152
153@@ -1057,13 +1057,13 @@
154
155 if ( !file.Write(filetext, *m_conv) )
156 {
157- wxLogError(_("can't write user configuration file."));
609ec907 158+ wxLogError(wxT("%s"), _("can't write user configuration file."));
b44bd5fb
JB		 159 return false;
160 }
161
162 if ( !file.Commit() )
163 {
164- wxLogError(_("Failed to update user configuration file."));
609ec907 165+ wxLogError(wxT("%s"), _("Failed to update user configuration file."));
b44bd5fb
JB		 166
167 return false;
168 }
169@@ -1090,7 +1090,7 @@
170 wxCharBuffer buf(line.mb_str(conv));
171 if ( !os.Write(buf, strlen(buf)) )
172 {
173- wxLogError(_("Error saving user configuration data."));
609ec907 174+ wxLogError(wxT("%s"), _("Error saving user configuration data."));
b44bd5fb
JB		 175
176 return false;
177 }
8de26838
JB		 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
180@@ -859,7 +859,7 @@
181
182 if ( path.empty() )
183 {
184- wxLogSysError(_("Failed to create a temporary file name"));
609ec907 185+ wxLogSysError(wxT("%s"), _("Failed to create a temporary file name"));
8de26838
JB		 186 }
187 else
188 {
189@@ -894,7 +894,7 @@
190 // fails, though of course it should be protected against
191 // possible infinite looping too.
192
193- wxLogError(_("Failed to open temporary file."));
609ec907 194+ wxLogError(wxT("%s"), _("Failed to open temporary file."));
8de26838
JB		 195
196 path.clear();
197 }
84f99935
JB		 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 @@
201
202 if ( !ok )
203 {
204- wxLogSysError(_("Failed to get the working directory"));
609ec907 205+ wxLogSysError(wxT("%s"), _("Failed to get the working directory"));
84f99935
JB		 206
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
3593df53
JB		 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
211@@ -237,7 +237,7 @@
212
213 if ( !wxModule::InitializeModules() )
214 {
215- wxLogError(_("Initialization failed in post init, aborting."));
609ec907 216+ wxLogError(wxT("%s"), _("Initialization failed in post init, aborting."));
3593df53
JB		 217 return false;
218 }
219
1b84f1e6
JB		 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
222@@ -228,7 +228,7 @@
223 if (( t0 != (time_t)-1 ) && ( t1 != (time_t)-1 ))
224 return (long)difftime(t1, t0) + (60 * 60 * 24 * 4);
225
226- wxLogSysError(_("Failed to get the local system time"));
609ec907 227+ wxLogSysError(wxT("%s"), _("Failed to get the local system time"));
1b84f1e6
JB		 228 return -1;
229 }
230
231@@ -286,7 +286,7 @@
232 }
233 else
234 {
235- wxLogError(_("wxGetTimeOfDay failed."));
609ec907 236+ wxLogError(wxT("%s"), _("wxGetTimeOfDay failed."));
1b84f1e6
JB		 237 return 0;
238 }
239 #elif defined(HAVE_FTIME)
fd5caa00
JB		 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
242@@ -790,7 +790,7 @@
243 while (!done) {
244 m_hdr->Read(*m_parent_i_stream);
245 if (m_parent_i_stream->Eof())
246- wxLogError(_("incomplete header block in tar"));
609ec907 247+ wxLogError(wxT("%s"), _("incomplete header block in tar"));
fd5caa00
JB		 248 if (!*m_parent_i_stream)
249 return wxSTREAM_READ_ERROR;
250 m_offset += TAR_BLOCKSIZE;
251@@ -813,7 +813,7 @@
252 if (m_sumType == SUM_SIGNED)
253 ok = chksum == m_hdr->Sum(true);
254 if (!ok) {
255- wxLogError(_("checksum failure reading tar header block"));
609ec907 256+ wxLogError(wxT("%s"), _("checksum failure reading tar header block"));
fd5caa00
JB		 257 return wxSTREAM_READ_ERROR;
258 }
259
260@@ -986,7 +986,7 @@
261 }
262
263 if (!ok || recPos < len || size != lastread) {
264- wxLogWarning(_("invalid data in extended tar header"));
6e6c71ed 265+ wxLogWarning(wxT("%s"), _("invalid data in extended tar header"));
fd5caa00
JB		 266 return false;
267 }
268
269@@ -996,7 +996,7 @@
270 wxFileOffset wxTarInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
271 {
272 if (!IsOpened()) {
273- wxLogError(_("tar entry not open"));
609ec907 274+ wxLogError(wxT("%s"), _("tar entry not open"));
fd5caa00
JB		 275 m_lasterror = wxSTREAM_READ_ERROR;
276 }
277 if (!IsOk())
278@@ -1018,7 +1018,7 @@
279 size_t wxTarInputStream::OnSysRead(void *buffer, size_t size)
280 {
281 if (!IsOpened()) {
282- wxLogError(_("tar entry not open"));
609ec907 283+ wxLogError(wxT("%s"), _("tar entry not open"));
fd5caa00
JB		 284 m_lasterror = wxSTREAM_READ_ERROR;
285 }
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"));
609ec907 292+ wxLogError(wxT("%s"), _("unexpected end of file"));
fd5caa00
JB		 293 m_lasterror = wxSTREAM_READ_ERROR;
294 }
295
296@@ -1371,7 +1371,7 @@
297 }
298
299 if (sizePos == wxInvalidOffset || !m_hdr->SetOctal(TAR_SIZE, m_pos)) {
300- wxLogError(_("incorrect size given for tar entry"));
609ec907 301+ wxLogError(wxT("%s"), _("incorrect size given for tar entry"));
fd5caa00
JB		 302 m_lasterror = wxSTREAM_WRITE_ERROR;
303 return false;
304 }
305@@ -1492,7 +1492,7 @@
306 wxFileOffset wxTarOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
307 {
308 if (!IsOpened()) {
309- wxLogError(_("tar entry not open"));
609ec907 310+ wxLogError(wxT("%s"), _("tar entry not open"));
fd5caa00
JB		 311 m_lasterror = wxSTREAM_WRITE_ERROR;
312 }
313 if (!IsOk() || m_datapos == wxInvalidOffset)
314@@ -1514,7 +1514,7 @@
315 size_t wxTarOutputStream::OnSysWrite(const void *buffer, size_t size)
316 {
317 if (!IsOpened()) {
318- wxLogError(_("tar entry not open"));
609ec907 319+ wxLogError(wxT("%s"), _("tar entry not open"));
fd5caa00
JB		 320 m_lasterror = wxSTREAM_WRITE_ERROR;
321 }
322 if (!IsOk() || !size)
bdb99308
JB		 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
325@@ -146,7 +146,7 @@
326 flags = wxZLIB_ZLIB;
327 }
328 else {
329- wxLogError(_("Gzip not supported by this version of zlib"));
609ec907 330+ wxLogError(wxT("%s"), _("Gzip not supported by this version of zlib"));
bdb99308
JB		 331 m_lasterror = wxSTREAM_READ_ERROR;
332 return;
333 }
334@@ -173,7 +173,7 @@
335 }
336 }
337
338- wxLogError(_("Can't initialize zlib inflate stream."));
609ec907 339+ wxLogError(wxT("%s"), _("Can't initialize zlib inflate stream."));
bdb99308
JB		 340 m_lasterror = wxSTREAM_READ_ERROR;
341 }
342
343@@ -236,7 +236,7 @@
344 m_lasterror = wxSTREAM_EOF;
345 else
346 #endif
347- wxLogError(_("Can't read inflate stream: unexpected EOF in underlying stream."));
609ec907 348+ wxLogError(wxT("%s"), _("Can't read inflate stream: unexpected EOF in underlying stream."));
bdb99308
JB		 349 break;
350
351 default:
352@@ -299,7 +299,7 @@
353
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"));
609ec907 357+ wxLogError(wxT("%s"), _("Gzip not supported by this version of zlib"));
bdb99308
JB		 358 m_lasterror = wxSTREAM_WRITE_ERROR;
359 return;
360 }
361@@ -327,7 +327,7 @@
362 }
363 }
364
365- wxLogError(_("Can't initialize zlib deflate stream."));
609ec907 366+ wxLogError(wxT("%s"), _("Can't initialize zlib deflate stream."));
bdb99308
JB		 367 m_lasterror = wxSTREAM_WRITE_ERROR;
368 }
369
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
372@@ -525,7 +525,7 @@
373 m_parent_o_stream = &stream;
374
375 if (deflateReset(m_deflate) != Z_OK) {
376- wxLogError(_("can't re-initialize zlib deflate stream"));
609ec907 377+ wxLogError(wxT("%s"), _("can't re-initialize zlib deflate stream"));
bdb99308
JB		 378 m_lasterror = wxSTREAM_WRITE_ERROR;
379 return false;
380 }
381@@ -550,7 +550,7 @@
382 m_parent_i_stream = &stream;
383
384 if (inflateReset(m_inflate) != Z_OK) {
385- wxLogError(_("can't re-initialize zlib inflate stream"));
609ec907 386+ wxLogError(wxT("%s"), _("can't re-initialize zlib inflate stream"));
bdb99308
JB		 387 m_lasterror = wxSTREAM_READ_ERROR;
388 return false;
389 }
390@@ -1269,7 +1269,7 @@
391
392 if (m_DiskNumber != 0 || m_StartDisk != 0 ||
393 m_EntriesHere != m_TotalEntries)
394- wxLogWarning(_("assuming this is a multi-part zip concatenated"));
6e6c71ed 395+ wxLogWarning(wxT("%s"), _("assuming this is a multi-part zip concatenated"));
bdb99308
JB		 396
397 return true;
398 }
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"));
609ec907 404+ wxLogError(wxT("%s"), _("invalid zip file"));
bdb99308
JB		 405 return false;
406 }
407 else {
408@@ -1484,7 +1484,7 @@
409 return true;
410 }
411
412- wxLogError(_("can't find central directory in zip"));
609ec907 413+ wxLogError(wxT("%s"), _("can't find central directory in zip"));
bdb99308
JB		 414 m_lasterror = wxSTREAM_READ_ERROR;
415 return false;
416 }
417@@ -1570,7 +1570,7 @@
418 return wxSTREAM_EOF;
419
420 if (m_signature != CENTRAL_MAGIC) {
421- wxLogError(_("error reading zip central directory"));
609ec907 422+ wxLogError(wxT("%s"), _("error reading zip central directory"));
bdb99308
JB		 423 return wxSTREAM_READ_ERROR;
424 }
425
426@@ -1661,7 +1661,7 @@
427 }
428 }
429
430- wxLogError(_("error reading zip local header"));
609ec907 431+ wxLogError(wxT("%s"), _("error reading zip local header"));
bdb99308
JB		 432 return wxSTREAM_READ_ERROR;
433 }
434
435@@ -1709,7 +1709,7 @@
436 == wxInvalidOffset)
437 return false;
438 if (ReadSignature() != LOCAL_MAGIC) {
439- wxLogError(_("bad zipfile offset to entry"));
609ec907 440+ wxLogError(wxT("%s"), _("bad zipfile offset to entry"));
bdb99308
JB		 441 return false;
442 }
443 }
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"));
609ec907 449+ wxLogError(wxT("%s"), _("stored file length not in Zip header"));
bdb99308
JB		 450 break;
451 }
452 m_store->Open(m_entry.GetSize());
453@@ -1790,7 +1790,7 @@
454 return m_inflate;
455
456 default:
457- wxLogError(_("unsupported Zip compression method"));
609ec907 458+ wxLogError(wxT("%s"), _("unsupported Zip compression method"));
bdb99308
JB		 459 }
460
461 return NULL;
462@@ -2171,7 +2171,7 @@
463 }
464
465 default:
466- wxLogError(_("unsupported Zip compression method"));
609ec907 467+ wxLogError(wxT("%s"), _("unsupported Zip compression method"));
bdb99308
JB		 468 }
469
470 return NULL;
0e6feeaf
JB		 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
473@@ -44,7 +44,7 @@
474 {
475 if ( pipe(m_fds) == -1 )
476 {
477- wxLogSysError(_("Pipe creation failed"));
609ec907 478+ wxLogSysError(wxT("%s"), _("Pipe creation failed"));
0e6feeaf
JB		 479
480 return FALSE;
481 }
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
484@@ -75,7 +75,7 @@
485 int exitcode = 0;
486 if ( waitpid(execData.pid, &exitcode, 0) == -1 || !WIFEXITED(exitcode) )
487 {
488- wxLogSysError(_("Waiting for subprocess termination failed"));
609ec907 489+ wxLogSysError(wxT("%s"), _("Waiting for subprocess termination failed"));
0e6feeaf
JB		 490 }
491
492 return exitcode;
0606d3fc
JB		 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
495@@ -267,7 +267,7 @@
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."));
609ec907 500+ wxLogError(wxT("%s"), _("Failed to access lock file."));
0606d3fc
JB		 501
502 return false;
503 }
504@@ -276,7 +276,7 @@
505 ssize_t count = file.Read(buf, WXSIZEOF(buf));
506 if ( count == wxInvalidOffset )
507 {
508- wxLogError(_("Failed to read PID from lock file."));
609ec907 509+ wxLogError(wxT("%s"), _("Failed to read PID from lock file."));
0606d3fc
JB		 510 }
511 else
512 {
81a9b85a
JB		 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
515@@ -729,7 +729,7 @@
516 int rc = pthread_setspecific(gs_keySelf, thread);
517 if ( rc != 0 )
518 {
519- wxLogSysError(rc, _("Cannot start thread: error writing TLS"));
609ec907 520+ wxLogSysError(rc, wxT("%s"), _("Cannot start thread: error writing TLS"));
81a9b85a
JB		 521
522 return (void *)-1;
523 }
524@@ -907,7 +907,7 @@
525 // wxLogDebug: it is possible to bring the system to its knees
526 // by creating too many threads and not joining them quite
527 // easily
528- wxLogError(_("Failed to join a thread, potential memory leak detected - please restart the program"));
609ec907 529+ wxLogError(wxT("%s"), _("Failed to join a thread, potential memory leak detected - please restart the program"));
81a9b85a
JB		 530 }
531
532 m_shouldBeJoined = false;
533@@ -1106,7 +1106,7 @@
534 int policy;
535 if ( pthread_attr_getschedpolicy(&attr, &policy) != 0 )
536 {
537- wxLogError(_("Cannot retrieve thread scheduling policy."));
609ec907 538+ wxLogError(wxT("%s"), _("Cannot retrieve thread scheduling policy."));
81a9b85a
JB		 539 }
540
541 #ifdef __VMS__
542@@ -1133,7 +1133,7 @@
543 if ( prio != WXTHREAD_DEFAULT_PRIORITY )
544 {
545 // notify the programmer that this doesn't work here
546- wxLogWarning(_("Thread priority setting is ignored."));
6e6c71ed 547+ wxLogWarning(wxT("%s"), _("Thread priority setting is ignored."));
81a9b85a
JB		 548 }
549 //else: we have default priority, so don't complain
550
551@@ -1433,7 +1433,7 @@
552 if ( pthread_cancel(m_internal->GetId()) != 0 )
553 #endif // HAVE_PTHREAD_CANCEL
554 {
555- wxLogError(_("Failed to terminate a thread."));
609ec907 556+ wxLogError(wxT("%s"), _("Failed to terminate a thread."));
81a9b85a
JB		 557
558 return wxTHREAD_MISC_ERROR;
559 }
560@@ -1615,7 +1615,7 @@
561 int rc = pthread_key_create(&gs_keySelf, NULL /* dtor function */);
562 if ( rc != 0 )
563 {
564- wxLogSysError(rc, _("Thread module initialization failed: failed to create thread key"));
609ec907 565+ wxLogSysError(rc, wxT("%s"), _("Thread module initialization failed: failed to create thread key"));
81a9b85a
JB		 566
567 return false;
568 }
feef0db8
JB		 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
571@@ -628,7 +628,7 @@
572 if ( !sockSrv->WaitForAccept() )
573 {
574 m_lastError = wxPROTO_CONNERR;
575- wxLogError(_("Timeout while waiting for FTP server to connect, try passive mode."));
609ec907 576+ wxLogError(wxT("%s"), _("Timeout while waiting for FTP server to connect, try passive mode."));
feef0db8
JB		 577 delete sock;
578 sock = NULL;
579 }
580@@ -689,7 +689,7 @@
581 {
582 m_lastError = wxPROTO_PROTERR;
583 delete sockSrv;
584- wxLogError(_("The FTP server doesn't support the PORT command."));
609ec907 585+ wxLogError(wxT("%s"), _("The FTP server doesn't support the PORT command."));
feef0db8
JB		 586 return NULL;
587 }
588
589@@ -701,7 +701,7 @@
590 {
591 if ( !DoSimpleCommand(_T("PASV")) )
592 {
593- wxLogError(_("The FTP server doesn't support passive mode."));
609ec907 594+ wxLogError(wxT("%s"), _("The FTP server doesn't support passive mode."));
feef0db8
JB		 595 return NULL;
596 }
597
fb5aa3ae
JB		 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
600@@ -432,7 +432,7 @@
601 switch ( select(fd + 1, &readfds, NULL, NULL, &tv) )
602 {
603 case -1:
604- wxLogSysError(_("Impossible to get child process input"));
609ec907 605+ wxLogSysError(wxT("%s"), _("Impossible to get child process input"));
fb5aa3ae
JB		 606 // fall through
607
608 case 0:
609@@ -543,7 +543,7 @@
610 #endif
611 if ( pid == -1 ) // error?
612 {
613- wxLogSysError( _("Fork failed") );
609ec907 614+ wxLogSysError(wxT("%s"), _("Fork failed") );
fb5aa3ae
JB		 615
616 ARGS_CLEANUP;
617
618@@ -596,7 +596,7 @@
619 dup2(pipeOut[wxPipe::Write], STDOUT_FILENO) == -1 ||
620 dup2(pipeErr[wxPipe::Write], STDERR_FILENO) == -1 )
621 {
622- wxLogSysError(_("Failed to redirect child process input/output"));
609ec907 623+ wxLogSysError(wxT("%s"), _("Failed to redirect child process input/output"));
fb5aa3ae
JB		 624 }
625
626 pipeIn.Close();
627@@ -806,7 +806,7 @@
628
629 if ( !ok )
630 {
631- wxLogSysError(_("Cannot get the hostname"));
609ec907 632+ wxLogSysError(wxT("%s"), _("Cannot get the hostname"));
fb5aa3ae
JB		 633 }
634
635 return ok;
abcd1fc9
JB		 636@@ -842,7 +842,7 @@
637 struct hostent *host = gethostbyname(wxSafeConvertWX2MB(buf));
638 if ( !host )
639 {
640- wxLogSysError(_("Cannot get the official hostname"));
609ec907 641+ wxLogSysError(wxT("%s"), _("Cannot get the official hostname"));
abcd1fc9
JB		 642
643 ok = false;
644 }
bec58ce9
JB		 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
647@@ -141,7 +141,7 @@
648 // Some people are sometimes fool.
649 if (name.empty())
650 {
651- wxLogWarning( _("Trying to solve a NULL hostname: giving up") );
6e6c71ed 652+ wxLogWarning(wxT("%s"), _("Trying to solve a NULL hostname: giving up") );
bec58ce9
JB		 653 return false;
654 }
655 m_origHostname = name;
bc1a777f
JB		 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
658@@ -409,7 +409,7 @@
659
660 if (sig != 0xfeeddead)
661 {
662- wxLogWarning(_("wxSocket: invalid signature in ReadMsg."));
6e6c71ed 663+ wxLogWarning(wxT("%s"), _("wxSocket: invalid signature in ReadMsg."));
bc1a777f
JB		 664 goto exit;
665 }
666
667@@ -463,7 +463,7 @@
668
669 if (sig != 0xdeadfeed)
670 {
671- wxLogWarning(_("wxSocket: invalid signature in ReadMsg."));
6e6c71ed 672+ wxLogWarning(wxT("%s"), _("wxSocket: invalid signature in ReadMsg."));
bc1a777f
JB		 673 goto exit;
674 }
675
676@@ -990,7 +990,7 @@
677 case GSOCK_CONNECTION: flag = GSOCK_CONNECTION_FLAG; break;
678 case GSOCK_LOST: flag = GSOCK_LOST_FLAG; break;
679 default:
680- wxLogWarning(_("wxSocket: unknown event!."));
6e6c71ed 681+ wxLogWarning(wxT("%s"), _("wxSocket: unknown event!."));
bc1a777f
JB		 682 return;
683 }
684
cb2c7854
JB		 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
687@@ -208,7 +208,7 @@
688 }
689 else //OOPS!
690 {
691- wxLogSysError(_("Failed to enumerate video modes"));
609ec907 692+ wxLogSysError(wxT("%s"), _("Failed to enumerate video modes"));
cb2c7854
JB		 693 }
694
695 return Modes;
696@@ -231,7 +231,7 @@
697
698 if( !XF86VidModeGetAllModeLines((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()), &nNumModes, &ppXModes) )
699 {
700- wxLogSysError(_("Failed to change video mode"));
609ec907 701+ wxLogSysError(wxT("%s"), _("Failed to change video mode"));
cb2c7854
JB		 702 return false;
703 }
704
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
707@@ -353,7 +353,7 @@
708 return false;
709 if(IsDialing())
710 {
711- wxLogError(_("Already dialling ISP."));
609ec907 712+ wxLogError(wxT("%s"), _("Already dialling ISP."));
cb2c7854
JB		 713 return false;
714 }
715 wxString cmd;
fa974f21
JB		 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 @@
719 {
720 // see comment in WriteText() as to why we must warn the user about
721 // this
722- wxLogWarning(_("Failed to set text in the text control."));
6e6c71ed 723+ wxLogWarning(wxT("%s"), _("Failed to set text in the text control."));
fa974f21
JB		 724 return;
725 }
726
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."));
6e6c71ed 732+ wxLogWarning(wxT("%s"), _("Failed to insert text in the control."));
fa974f21
JB		 733 return;
734 }
735
e151a3d9
JB		 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
738@@ -612,7 +612,7 @@
739 return true;
740 }
741
742- wxLogError(_("Sorry, could not open this file."));
609ec907 743+ wxLogError(wxT("%s"), _("Sorry, could not open this file."));
e151a3d9
JB		 744 return false;
745 }
746
39e7bb11
JB		 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
749@@ -320,7 +320,7 @@
750 // message
751 if ( encoding == wxFONTENCODING_SYSTEM )
752 {
753- wxLogFatalError(_("can't load any font, aborting"));
3762fb0b 754+ wxLogFatalError(wxT("%s"), _("can't load any font, aborting"));
39e7bb11
JB		 755
756 // wxLogFatalError doesn't return
757 }
25bf4cad
JB		 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
760@@ -88,7 +88,7 @@
761 if ( !image->Ok() )
762 {
763 if ( verbose )
764- wxLogError(_("BMP: Couldn't save invalid image."));
609ec907 765+ wxLogError(wxT("%s"), _("BMP: Couldn't save invalid image."));
25bf4cad
JB		 766 return false;
767 }
768
769@@ -122,7 +122,7 @@
770 )
771 {
772 if ( verbose )
773- wxLogError(_("BMP: wxImage doesn't have own wxPalette."));
609ec907 774+ wxLogError(wxT("%s"), _("BMP: wxImage doesn't have own wxPalette."));
25bf4cad
JB		 775 return false;
776 }
777 bpp = 8;
778@@ -197,7 +197,7 @@
779 )
780 {
781 if (verbose)
782- wxLogError(_("BMP: Couldn't write the file (Bitmap) header."));
609ec907 783+ wxLogError(wxT("%s"), _("BMP: Couldn't write the file (Bitmap) header."));
25bf4cad
JB		 784 return false;
785 }
786 }
787@@ -218,7 +218,7 @@
788 )
789 {
790 if (verbose)
791- wxLogError(_("BMP: Couldn't write the file (BitmapInfo) header."));
609ec907 792+ wxLogError(wxT("%s"), _("BMP: Couldn't write the file (BitmapInfo) header."));
25bf4cad
JB		 793 return false;
794 }
795 }
796@@ -292,7 +292,7 @@
797 if ( !stream.Write(rgbquad, palette_size*4) )
798 {
799 if (verbose)
800- wxLogError(_("BMP: Couldn't write RGB color map."));
609ec907 801+ wxLogError(wxT("%s"), _("BMP: Couldn't write RGB color map."));
25bf4cad
JB		 802 delete[] rgbquad;
803 #if wxUSE_PALETTE
804 delete palette;
805@@ -425,7 +425,7 @@
806 if ( !stream.Write(buffer, row_width) )
807 {
808 if (verbose)
809- wxLogError(_("BMP: Couldn't write data."));
609ec907 810+ wxLogError(wxT("%s"), _("BMP: Couldn't write data."));
25bf4cad
JB		 811 delete[] buffer;
812 #if wxUSE_PALETTE
813 delete palette;
814@@ -471,7 +471,7 @@
815 if ( !cmap )
816 {
817 if (verbose)
818- wxLogError(_("BMP: Couldn't allocate memory."));
609ec907 819+ wxLogError(wxT("%s"), _("BMP: Couldn't allocate memory."));
25bf4cad
JB		 820 return false;
821 }
822 }
823@@ -487,7 +487,7 @@
824 if ( !ptr )
825 {
826 if ( verbose )
827- wxLogError( _("BMP: Couldn't allocate memory.") );
609ec907 828+ wxLogError(wxT("%s"), _("BMP: Couldn't allocate memory.") );
25bf4cad
JB		 829 delete[] cmap;
830 return false;
831 }
832@@ -501,7 +501,7 @@
833 if ( !alpha )
834 {
835 if ( verbose )
836- wxLogError(_("BMP: Couldn't allocate memory."));
609ec907 837+ wxLogError(wxT("%s"), _("BMP: Couldn't allocate memory."));
25bf4cad
JB		 838 delete[] cmap;
839 return false;
840 }
841@@ -898,13 +898,13 @@
842 if ( width > 32767 )
843 {
844 if (verbose)
845- wxLogError( _("DIB Header: Image width > 32767 pixels for file.") );
609ec907 846+ wxLogError(wxT("%s"), _("DIB Header: Image width > 32767 pixels for file.") );
25bf4cad
JB		 847 return false;
848 }
849 if ( height > 32767 )
850 {
851 if (verbose)
852- wxLogError( _("DIB Header: Image height > 32767 pixels for file.") );
609ec907 853+ wxLogError(wxT("%s"), _("DIB Header: Image height > 32767 pixels for file.") );
25bf4cad
JB		 854 return false;
855 }
856
857@@ -918,7 +918,7 @@
858 if ( bpp != 1 && bpp != 4 && bpp != 8 && bpp != 16 && bpp != 24 && bpp != 32 )
859 {
860 if (verbose)
861- wxLogError( _("DIB Header: Unknown bitdepth in file.") );
609ec907 862+ wxLogError(wxT("%s"), _("DIB Header: Unknown bitdepth in file.") );
25bf4cad
JB		 863 return false;
864 }
865
866@@ -928,7 +928,7 @@
867 comp != BI_BITFIELDS )
868 {
869 if (verbose)
870- wxLogError( _("DIB Header: Unknown encoding in file.") );
609ec907 871+ wxLogError(wxT("%s"), _("DIB Header: Unknown encoding in file.") );
25bf4cad
JB		 872 return false;
873 }
874
875@@ -942,7 +942,7 @@
876 ((comp == BI_BITFIELDS) && (bpp != 16 && bpp != 32)))
877 {
878 if (verbose)
879- wxLogError( _("DIB Header: Encoding doesn't match bitdepth.") );
609ec907 880+ wxLogError(wxT("%s"), _("DIB Header: Encoding doesn't match bitdepth.") );
25bf4cad
JB		 881 return false;
882 }
883
884@@ -951,7 +951,7 @@
885 verbose, IsBmp, true) )
886 {
887 if (verbose)
888- wxLogError( _("Error in reading image DIB.") );
609ec907 889+ wxLogError(wxT("%s"), _("Error in reading image DIB.") );
25bf4cad
JB		 890 return false;
891 }
892
893@@ -964,7 +964,7 @@
894 verbose, IsBmp, false) )
895 {
896 if (verbose)
897- wxLogError( _("ICO: Error in reading mask DIB.") );
609ec907 898+ wxLogError(wxT("%s"), _("ICO: Error in reading mask DIB.") );
25bf4cad
JB		 899 return false;
900 }
901 image->SetMaskFromImage(mask, 255, 255, 255);
902@@ -1037,13 +1037,13 @@
903 if ( image->GetHeight () > 127 )
904 {
905 if ( verbose )
906- wxLogError(_("ICO: Image too tall for an icon."));
609ec907 907+ wxLogError(wxT("%s"), _("ICO: Image too tall for an icon."));
25bf4cad
JB		 908 return false;
909 }
910 if ( image->GetWidth () > 255 )
911 {
912 if ( verbose )
913- wxLogError(_("ICO: Image too wide for an icon."));
609ec907 914+ wxLogError(wxT("%s"), _("ICO: Image too wide for an icon."));
25bf4cad
JB		 915 return false;
916 }
917
918@@ -1069,7 +1069,7 @@
919 if ( !stream.IsOk() )
920 {
921 if ( verbose )
922- wxLogError(_("ICO: Error writing the image file!"));
609ec907 923+ wxLogError(wxT("%s"), _("ICO: Error writing the image file!"));
25bf4cad
JB		 924 return false;
925 }
926
927@@ -1128,7 +1128,7 @@
928 if ( !bResult )
929 {
930 if ( verbose )
931- wxLogError(_("ICO: Error writing the image file!"));
609ec907 932+ wxLogError(wxT("%s"), _("ICO: Error writing the image file!"));
25bf4cad
JB		 933 return false;
934 }
935 IsMask = true;
936@@ -1137,7 +1137,7 @@
937 if ( !bResult )
938 {
939 if ( verbose )
940- wxLogError(_("ICO: Error writing the image file!"));
609ec907 941+ wxLogError(wxT("%s"), _("ICO: Error writing the image file!"));
25bf4cad
JB		 942 return false;
943 }
944 wxUint32 Size = cStream.GetSize();
945@@ -1192,7 +1192,7 @@
946 if ( !stream.IsOk() )
947 {
948 if ( verbose )
949- wxLogError(_("ICO: Error writing the image file!"));
609ec907 950+ wxLogError(wxT("%s"), _("ICO: Error writing the image file!"));
25bf4cad
JB		 951 return false;
952 }
953
954@@ -1202,7 +1202,7 @@
955 if ( !bResult )
956 {
957 if ( verbose )
958- wxLogError(_("ICO: Error writing the image file!"));
609ec907 959+ wxLogError(wxT("%s"), _("ICO: Error writing the image file!"));
25bf4cad
JB		 960 return false;
961 }
962 IsMask = true;
963@@ -1211,7 +1211,7 @@
964 if ( !bResult )
965 {
966 if ( verbose )
967- wxLogError(_("ICO: Error writing the image file!"));
609ec907 968+ wxLogError(wxT("%s"), _("ICO: Error writing the image file!"));
25bf4cad
JB		 969 return false;
970 }
971
972@@ -1276,7 +1276,7 @@
973
974 if ( iSel == wxNOT_FOUND || iSel < 0 || iSel >= nIcons )
975 {
976- wxLogError(_("ICO: Invalid icon index."));
609ec907 977+ wxLogError(wxT("%s"), _("ICO: Invalid icon index."));
25bf4cad
JB		 978 bResult = false;
979 }
980 else
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 () ) )
986 {
987- wxLogError( _("Image and mask have different sizes.") );
609ec907 988+ wxLogError(wxT("%s"), _("Image and mask have different sizes.") );
25bf4cad
JB		 989 return false;
990 }
991
992@@ -1850,7 +1850,7 @@
993 unsigned char r,g,b ;
994 if (!FindFirstUnusedColour(&r, &g, &b))
995 {
996- wxLogError( _("No unused colour in image being masked.") );
609ec907 997+ wxLogError(wxT("%s"), _("No unused colour in image being masked.") );
25bf4cad
JB		 998 return false ;
999 }
1000
1001@@ -1891,7 +1891,7 @@
1002 unsigned char mr, mg, mb;
1003 if (!FindFirstUnusedColour(&mr, &mg, &mb))
1004 {
1005- wxLogError( _("No unused colour in image being masked.") );
609ec907 1006+ wxLogError(wxT("%s"), _("No unused colour in image being masked.") );
25bf4cad
JB		 1007 return false;
1008 }
1009
1010@@ -2172,7 +2172,7 @@
1011
1012 }
1013
1014- wxLogWarning(_("No handler found for image type."));
6e6c71ed 1015+ wxLogWarning(wxT("%s"), _("No handler found for image type."));
25bf4cad
JB		 1016 return 0;
1017 }
1018
1019@@ -2215,7 +2215,7 @@
1020
1021 }
1022
1023- wxLogWarning( _("No handler found for image type.") );
6e6c71ed 1024+ wxLogWarning(wxT("%s"), _("No handler found for image type.") );
25bf4cad
JB		 1025 return false;
1026 }
1027
1028@@ -2696,7 +2696,7 @@
1029 b2++;
1030 if ( b2 >= 255 )
1031 {
1032- wxLogError(_("No unused colour in image.") );
609ec907 1033+ wxLogError(wxT("%s"),_("No unused colour in image.") );
25bf4cad
JB		 1034 return false;
1035 }
1036 }
d748e59e
JB		 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
1039@@ -51,13 +51,13 @@
1040 switch (error)
1041 {
1042 case wxGIF_INVFORMAT:
1043- wxLogError(_("GIF: error in GIF image format."));
609ec907 1044+ wxLogError(wxT("%s"), _("GIF: error in GIF image format."));
d748e59e
JB		 1045 break;
1046 case wxGIF_MEMERR:
1047- wxLogError(_("GIF: not enough memory."));
609ec907 1048+ wxLogError(wxT("%s"), _("GIF: not enough memory."));
d748e59e
JB		 1049 break;
1050 default:
1051- wxLogError(_("GIF: unknown error!!!"));
609ec907 1052+ wxLogError(wxT("%s"), _("GIF: unknown error!!!"));
d748e59e
JB		 1053 break;
1054 }
1055 }
1056@@ -67,7 +67,7 @@
1057
1058 if ((error == wxGIF_TRUNCATED) && verbose)
1059 {
1060- wxLogError(_("GIF: data stream seems to be truncated."));
609ec907 1061+ wxLogError(wxT("%s"), _("GIF: data stream seems to be truncated."));
d748e59e
JB		 1062 /* go on; image data is OK */
1063 }
1064
1065@@ -77,7 +77,7 @@
1066 }
1067 else
1068 {
1069- wxLogError(_("GIF: Invalid gif index."));
609ec907 1070+ wxLogError(wxT("%s"), _("GIF: Invalid gif index."));
d748e59e
JB		 1071 }
1072
1073 delete decod;
b252882f
JB		 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
1076@@ -247,7 +247,7 @@
1077 * We need to clean up the JPEG object, close the input file, and return.
1078 */
1079 if (verbose)
1080- wxLogError(_("JPEG: Couldn't load - file is probably corrupted."));
609ec907 1081+ wxLogError(wxT("%s"), _("JPEG: Couldn't load - file is probably corrupted."));
b252882f
JB		 1082 (cinfo.src->term_source)(&cinfo);
1083 jpeg_destroy_decompress(&cinfo);
1084 if (image->Ok()) image->Destroy();
1085@@ -390,7 +390,7 @@
1086 * We need to clean up the JPEG object, close the input file, and return.
1087 */
1088 if (verbose)
1089- wxLogError(_("JPEG: Couldn't save image."));
609ec907 1090+ wxLogError(wxT("%s"), _("JPEG: Couldn't save image."));
b252882f
JB		 1091 jpeg_destroy_compress(&cinfo);
1092 return false;
1093 }
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
1096@@ -439,7 +439,7 @@
1097 if (!CanRead(stream))
1098 {
1099 if (verbose)
1100- wxLogError(_("PCX: this is not a PCX file."));
609ec907 1101+ wxLogError(wxT("%s"), _("PCX: this is not a PCX file."));
b252882f
JB		 1102
1103 return false;
1104 }
1105@@ -452,10 +452,10 @@
1106 {
1107 switch (error)
1108 {
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 !!!"));
609ec907
JB		 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 !!!"));
b252882f
JB		 1117 }
1118 }
1119 image->Destroy();
1120@@ -475,9 +475,9 @@
1121 {
1122 switch (error)
1123 {
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 !!!"));
609ec907
JB		 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 !!!"));
b252882f
JB		 1130 }
1131 }
1132 }
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
1135@@ -175,7 +175,7 @@
1136 {
1137 wxPNGInfoStruct *info = png_ptr ? WX_PNG_INFO(png_ptr) : NULL;
1138 if ( !info || info->verbose )
1139- wxLogWarning( wxString::FromAscii(message) );
6e6c71ed 1140+ wxLogWarning(wxT("%s"), message );
b252882f
JB		 1141 }
1142
1143 // from pngerror.c
1144@@ -293,7 +293,7 @@
1145
1146 if ( !h.FindFirstUnusedColour(&rMask, &gMask, &bMask) )
1147 {
1148- wxLogWarning(_("Too many colours in PNG, the image may be slightly blurred."));
6e6c71ed 1149+ wxLogWarning(wxT("%s"), _("Too many colours in PNG, the image may be slightly blurred."));
b252882f
JB		 1150
1151 // use a fixed mask colour and we'll fudge
1152 // the real pixels with this colour (see
1153@@ -621,7 +621,7 @@
1154
1155 error:
1156 if (verbose)
1157- wxLogError(_("Couldn't load a PNG image - file is corrupted or not enough memory."));
609ec907 1158+ wxLogError(wxT("%s"), _("Couldn't load a PNG image - file is corrupted or not enough memory."));
b252882f
JB		 1159
1160 if ( image->Ok() )
1161 {
1162@@ -670,7 +670,7 @@
1163 if (!png_ptr)
1164 {
1165 if (verbose)
1166- wxLogError(_("Couldn't save PNG image."));
609ec907 1167+ wxLogError(wxT("%s"), _("Couldn't save PNG image."));
b252882f
JB		 1168 return false;
1169 }
1170
1171@@ -679,7 +679,7 @@
1172 {
1173 png_destroy_write_struct( &png_ptr, (png_infopp)NULL );
1174 if (verbose)
1175- wxLogError(_("Couldn't save PNG image."));
609ec907 1176+ wxLogError(wxT("%s"), _("Couldn't save PNG image."));
b252882f
JB		 1177 return false;
1178 }
1179
1180@@ -687,7 +687,7 @@
1181 {
1182 png_destroy_write_struct( &png_ptr, (png_infopp)NULL );
1183 if (verbose)
1184- wxLogError(_("Couldn't save PNG image."));
609ec907 1185+ wxLogError(wxT("%s"), _("Couldn't save PNG image."));
b252882f
JB		 1186 return false;
1187 }
1188
ecdad9f8
JB		 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
1191@@ -69,7 +69,7 @@
1192 case wxT('5'): // RAW Grey
1193 case wxT('6'): break;
1194 default:
1195- if (verbose) wxLogError(_("PNM: File format is not recognized."));
609ec907 1196+ if (verbose) wxLogError(wxT("%s"), _("PNM: File format is not recognized."));
ecdad9f8
JB		 1197 return false;
1198 }
1199
1200@@ -85,7 +85,7 @@
1201 if (!ptr)
1202 {
1203 if (verbose)
1204- wxLogError( _("PNM: Couldn't allocate memory.") );
609ec907 1205+ wxLogError(wxT("%s"), _("PNM: Couldn't allocate memory.") );
ecdad9f8
JB		 1206 return false;
1207 }
1208
1209@@ -103,7 +103,7 @@
1210 *ptr++=(unsigned char)value; // B
1211 if ( !buf_stream )
1212 {
1213- if (verbose) wxLogError(_("PNM: File seems truncated."));
609ec907 1214+ if (verbose) wxLogError(wxT("%s"), _("PNM: File seems truncated."));
ecdad9f8
JB		 1215 return false;
1216 }
1217 }
1218@@ -122,7 +122,7 @@
1219
1220 if ( !buf_stream )
1221 {
1222- if (verbose) wxLogError(_("PNM: File seems truncated."));
609ec907 1223+ if (verbose) wxLogError(wxT("%s"), _("PNM: File seems truncated."));
ecdad9f8
JB		 1224 return false;
1225 }
1226 }
1227@@ -141,7 +141,7 @@
1228 *ptr++=value; // B
1229 if ( !buf_stream )
1230 {
1231- if (verbose) wxLogError(_("PNM: File seems truncated."));
609ec907 1232+ if (verbose) wxLogError(wxT("%s"), _("PNM: File seems truncated."));
ecdad9f8
JB		 1233 return false;
1234 }
1235 }
32611bf4
JB		 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
1238@@ -245,7 +245,7 @@
1239 if (!tif)
1240 {
1241 if (verbose)
1242- wxLogError( _("TIFF: Error loading image.") );
609ec907 1243+ wxLogError(wxT("%s"), _("TIFF: Error loading image.") );
32611bf4
JB		 1244
1245 return false;
1246 }
1247@@ -253,7 +253,7 @@
1248 if (!TIFFSetDirectory( tif, (tdir_t)index ))
1249 {
1250 if (verbose)
1251- wxLogError( _("Invalid TIFF image index.") );
609ec907 1252+ wxLogError(wxT("%s"), _("Invalid TIFF image index.") );
32611bf4
JB		 1253
1254 TIFFClose( tif );
1255
1256@@ -280,7 +280,7 @@
1257 if ( bytesNeeded >= 4294967295U /* UINT32_MAX */ )
1258 {
1259 if ( verbose )
1260- wxLogError( _("TIFF: Image size is abnormally big.") );
609ec907 1261+ wxLogError(wxT("%s"), _("TIFF: Image size is abnormally big.") );
32611bf4
JB		 1262
1263 TIFFClose(tif);
1264
1265@@ -292,7 +292,7 @@
1266 if (!raster)
1267 {
1268 if (verbose)
1269- wxLogError( _("TIFF: Couldn't allocate memory.") );
609ec907 1270+ wxLogError(wxT("%s"), _("TIFF: Couldn't allocate memory.") );
32611bf4
JB		 1271
1272 TIFFClose( tif );
1273
1274@@ -303,7 +303,7 @@
1275 if (!image->Ok())
1276 {
1277 if (verbose)
1278- wxLogError( _("TIFF: Couldn't allocate memory.") );
609ec907 1279+ wxLogError(wxT("%s"), _("TIFF: Couldn't allocate memory.") );
32611bf4
JB		 1280
1281 _TIFFfree( raster );
1282 TIFFClose( tif );
1283@@ -317,7 +317,7 @@
1284 if (!TIFFReadRGBAImage( tif, w, h, raster, 0 ))
1285 {
1286 if (verbose)
1287- wxLogError( _("TIFF: Error reading image.") );
609ec907 1288+ wxLogError(wxT("%s"), _("TIFF: Error reading image.") );
32611bf4
JB		 1289
1290 _TIFFfree( raster );
1291 image->Destroy();
1292@@ -385,7 +385,7 @@
1293 if (!tif)
1294 {
1295 if (verbose)
1296- wxLogError( _("TIFF: Error saving image.") );
609ec907 1297+ wxLogError(wxT("%s"), _("TIFF: Error saving image.") );
32611bf4
JB		 1298
1299 return false;
1300 }
1301@@ -443,7 +443,7 @@
1302 if (!buf)
1303 {
1304 if (verbose)
1305- wxLogError( _("TIFF: Couldn't allocate memory.") );
609ec907 1306+ wxLogError(wxT("%s"), _("TIFF: Couldn't allocate memory.") );
32611bf4
JB		 1307
1308 TIFFClose( tif );
1309
1310@@ -489,7 +489,7 @@
1311 if ( TIFFWriteScanline(tif, buf ? buf : ptr, (uint32)row, 0) < 0 )
1312 {
1313 if (verbose)
1314- wxLogError( _("TIFF: Error writing image.") );
609ec907 1315+ wxLogError(wxT("%s"), _("TIFF: Error writing image.") );
32611bf4
JB		 1316
1317 TIFFClose( tif );
1318 if (buf)
ccee7a5f
JB		 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
1321@@ -215,7 +215,7 @@
1322 }
1323 }
1324
1325- wxLogError(_("File couldn't be loaded."));
609ec907 1326+ wxLogError(wxT("%s"), _("File couldn't be loaded."));
ccee7a5f
JB		 1327 #endif // wxUSE_FFILE
1328
1329 return false;
1330@@ -251,7 +251,7 @@
1331 }
1332 #endif // wxUSE_FFILE
1333
1334- wxLogError(_("The text couldn't be saved."));
609ec907 1335+ wxLogError(wxT("%s"), _("The text couldn't be saved."));
ccee7a5f
JB		 1336
1337 return false;
1338 }
d148c13b
JB		 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() )
1344 {
1345- wxLogWarning(_("Could not transfer data to window"));
6e6c71ed 1346+ wxLogWarning(wxT("%s"), _("Could not transfer data to window"));
d148c13b
JB		 1347 #if wxUSE_LOG
1348 wxLog::FlushActive();
1349 #endif // wxUSE_LOG
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
1352@@ -680,7 +680,7 @@
1353 &width, &height, &colors_cnt, &chars_per_pixel);
1354 if ( count != 4 || width * height * colors_cnt == 0 )
1355 {
1356- wxLogError(_("XPM: incorrect header format!"));
609ec907 1357+ wxLogError(wxT("%s"), _("XPM: incorrect header format!"));
d148c13b
JB		 1358 return wxNullImage;
1359 }
1360
1361@@ -792,7 +792,7 @@
1362 entry = clr_tbl.find(key);
1363 if ( entry == end )
1364 {
1365- wxLogError(_("XPM: Malformed pixel data!"));
609ec907 1366+ wxLogError(wxT("%s"), _("XPM: Malformed pixel data!"));
d148c13b
JB		 1367
1368 // better return right now as otherwise we risk to flood the
1369 // user with error messages as something seems to be seriously
457caf74
JB		 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 @@
1373
1374 if (!m_pstream)
1375 {
1376- wxLogError( _("Cannot open file for PostScript printing!"));
609ec907 1377+ wxLogError(wxT("%s"), _("Cannot open file for PostScript printing!"));
457caf74
JB		 1378 m_ok = false;
1379 return false;
1380 }
866b5c98
JB		 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
1383@@ -572,7 +572,7 @@
1384 bOk = file.Close();
1385
1386 if ( !bOk ) {
1387- wxLogError(_("Can't save log contents to file."));
609ec907 1388+ wxLogError(wxT("%s"), _("Can't save log contents to file."));
866b5c98
JB		 1389 }
1390 else {
1391 wxLogStatus(this, _("Log saved to the file '%s'."), filename.c_str());
1392@@ -1023,7 +1023,7 @@
1393 ok = file.Close();
1394
1395 if ( !ok )
1396- wxLogError(_("Can't save log contents to file."));
609ec907 1397+ wxLogError(wxT("%s"), _("Can't save log contents to file."));
866b5c98
JB		 1398 #endif // wxUSE_FILEDLG
1399 }
1400
d5909123
JB		 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
1403@@ -178,7 +178,7 @@
1404 if (!printout->OnBeginDocument(m_printDialogData.GetFromPage(), m_printDialogData.GetToPage()))
1405 {
1406 wxEndBusyCursor();
1407- wxLogError(_("Could not start printing."));
609ec907 1408+ wxLogError(wxT("%s"), _("Could not start printing."));
d5909123
JB		 1409 sm_lastError = wxPRINTER_ERROR;
1410 break;
1411 }
8f21f644
JB		 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
1414@@ -490,7 +490,7 @@
1415 Free();
1416 if (!LoadWAV(data, size, true))
1417 {
1418- wxLogError(_("Sound data are in unsupported format."));
609ec907 1419+ wxLogError(wxT("%s"), _("Sound data are in unsupported format."));
8f21f644
JB		 1420 return false;
1421 }
1422 return true;
e9f238d5
JB		 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
1425@@ -798,7 +798,7 @@
1426
1427 if ( GetProtocol(left) != _T("file") )
1428 {
1429- wxLogError(_("CHM handler currently supports only local files!"));
609ec907 1430+ wxLogError(wxT("%s"), _("CHM handler currently supports only local files!"));
e9f238d5
JB		 1431 return NULL;
1432 }
1433
1434@@ -821,7 +821,7 @@
1435 if ( (index=right.Index(_T("//"))) != wxNOT_FOUND )
1436 {
1437 right=wxString(right.Mid(index+1));
1438- wxLogWarning(_("Link contained '//', converted to absolute link."));
6e6c71ed 1439+ wxLogWarning(wxT("%s"), _("Link contained '//', converted to absolute link."));
e9f238d5
JB		 1440 }
1441
1442 wxFileName leftFilename = wxFileSystem::URLToFileName(left);
4620993b
JB		 1443@@ -859,7 +859,7 @@
1444
1445 if ( GetProtocol(left) != _T("file") )
1446 {
1447- wxLogError(_("CHM handler currently supports only local files!"));
609ec907 1448+ wxLogError(wxT("%s"), _("CHM handler currently supports only local files!"));
4620993b
JB		 1449 return wxEmptyString;
1450 }
1451
a34551fe
JB		 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."));
6e6c71ed 1459+ wxLogWarning(wxT("%s"), _("Cannot print empty page."));
a34551fe
JB		 1460 else
1461 m_Printer->PrintFile(m_HtmlWin->GetOpenedPage());
1462 }
eee3f0ac
JB		 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
1465@@ -382,7 +382,7 @@
1466 #endif // wxUSE_STL/!wxUSE_STL
1467 )
1468 {
1469- wxLogWarning(_("Warning: attempt to remove HTML tag handler from empty stack."));
6e6c71ed 1470+ wxLogWarning(wxT("%s"), _("Warning: attempt to remove HTML tag handler from empty stack."));
eee3f0ac
JB		 1471 return;
1472 }
1473 m_HandlersHash = *((wxHashTable*) first->GetData());
75cebd42
JB		 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
1476@@ -307,7 +307,7 @@
1477
1478 if (ff == NULL)
1479 {
1480- wxLogError(htmlfile + _(": file does not exist!"));
609ec907 1481+ wxLogError(wxT("%s"), (htmlfile + _(": file does not exist!")).c_str());
75cebd42
JB		 1482 return;
1483 }
1484
1485@@ -615,7 +615,7 @@
1486 {
1487 if (!GetPrintData()->Ok())
1488 {
1489- wxLogError(_("There was a problem during page setup: you may need to set a default printer."));
609ec907 1490+ wxLogError(wxT("%s"), _("There was a problem during page setup: you may need to set a default printer."));
75cebd42
JB		 1491 return;
1492 }
1493
f7400821
JB		 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
1496@@ -206,7 +206,7 @@
1497 if ( !wxMkdir(m_dir, 0700) )
1498 {
1499 wxLogSysError(_("Failed to create directory \"%s\""), m_dir.c_str());
1500- wxLogError(_("Debug report couldn't be created."));
609ec907 1501+ wxLogError(wxT("%s"), _("Debug report couldn't be created."));
f7400821
JB		 1502
1503 Reset();
1504 }
1505@@ -542,7 +542,7 @@
1506 {
1507 if ( !GetFilesCount() )
1508 {
1509- wxLogError(_("Debug report generation has failed."));
609ec907 1510+ wxLogError(wxT("%s"), _("Debug report generation has failed."));
f7400821
JB		 1511
1512 return false;
1513 }
1514@@ -669,7 +669,7 @@
1515 errors);
1516 if ( rc == -1 )
1517 {
1518- wxLogError(_("Failed to execute curl, please install it in PATH."));
609ec907 1519+ wxLogError(wxT("%s"), _("Failed to execute curl, please install it in PATH."));
f7400821
JB		 1520 }
1521 else if ( rc != 0 )
1522 {
33ec5fda
JB		 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
1525@@ -79,7 +79,7 @@
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);
609ec907 1530+ wxLogError(wxT("%s"), (wxT("Error in resource, unknown statusbar field style: ") + first).c_str());
33ec5fda
JB		 1531
1532 if(styles.Find(wxT(',')))
1533 styles.Remove(0, styles.Find(wxT(',')) + 1);
0db713cc
JB		 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
1536@@ -501,7 +501,7 @@
1537 m_version = version;
1538 if (m_version != version)
1539 {
1540- wxLogError(_("Resource files must have same version number!"));
609ec907 1541+ wxLogError(wxT("%s"), _("Resource files must have same version number!"));
0db713cc
JB		 1542 rt = false;
1543 }
1544
1545@@ -863,7 +863,7 @@
1546 if (index != wxNOT_FOUND)
1547 style |= m_styleValues[index];
1548 else
1549- wxLogError(_("Unknown style flag ") + fl);
609ec907 1550+ wxLogError(wxT("%s"), (_("Unknown style flag ") + fl).c_str());
0db713cc
JB		 1551 }
1552 return style;
1553 }
1554@@ -1268,7 +1268,7 @@
1555 }
1556 else
1557 {
1558- wxLogError(_("Cannot convert dialog units: dialog unknown."));
609ec907 1559+ wxLogError(wxT("%s"), _("Cannot convert dialog units: dialog unknown."));
0db713cc
JB		 1560 return wxDefaultSize;
1561 }
1562 }
1563@@ -1316,7 +1316,7 @@
1564 }
1565 else
1566 {
1567- wxLogError(_("Cannot convert dialog units: dialog unknown."));
609ec907 1568+ wxLogError(wxT("%s"), _("Cannot convert dialog units: dialog unknown."));
0db713cc
JB		 1569 return defaultv;
1570 }
1571 }
2fca03f9
JB		 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 @@
1575 return true;
1576 else
1577 {
1578- wxLogError(_("File couldn't be loaded."));
609ec907 1579+ wxLogError(wxT("%s"), _("File couldn't be loaded."));
2fca03f9
JB		 1580
1581 return false;
1582 }
1583@@ -2152,7 +2152,7 @@
1584 return true;
1585 }
1586
1587- wxLogError(_("The text couldn't be saved."));
609ec907 1588+ wxLogError(wxT("%s"), _("The text couldn't be saved."));
2fca03f9
JB		 1589
1590 return false;
1591 }
70186b14
JB		 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
1594@@ -572,7 +572,7 @@
1595 {
1596 if (!GetPrintData()->Ok())
1597 {
1598- wxLogError(_("There was a problem during page setup: you may need to set a default printer."));
609ec907 1599+ wxLogError(wxT("%s"), _("There was a problem during page setup: you may need to set a default printer."));
70186b14
JB		 1600 return;
1601 }
1602
3857e716
JB		 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
1605@@ -167,7 +167,7 @@
1606 // open and set up the X11 display
1607 if ( !wxSetDisplay(displayName) )
1608 {
1609- wxLogError(_("wxWidgets could not open display. Exiting."));
1610+ wxLogError(wxT("%s"), _("wxWidgets could not open display. Exiting."));
1611 return false;
1612 }
1613
d2481809
JB		 1614--- wxWidgets-2.8.12/src/univ/theme.cpp.orig 2011-03-22 13:01:29.000000000 +0100
1615+++ wxWidgets-2.8.12/src/univ/theme.cpp 2012-10-02 18:52:10.454085849 +0200
1616@@ -111,7 +111,7 @@
1617 // abort if still nothing
1618 if ( !theme )
1619 {
1620- wxLogError(_("Failed to initialize GUI: no built-in themes found."));
1621+ wxLogError(wxT("%s"), _("Failed to initialize GUI: no built-in themes found."));
1622
1623 return false;
1624 }
1fb18621
JB		 1625--- wxWidgets-2.8.12/src/generic/animateg.cpp.orig 2011-03-22 12:59:43.000000000 +0100
1626+++ wxWidgets-2.8.12/src/generic/animateg.cpp 2012-10-02 19:46:51.397350796 +0200
1627@@ -141,7 +141,7 @@
1628
1629 }
1630
1631- wxLogWarning( _("No handler found for animation type.") );
1632+ wxLogWarning(wxT("%s"), _("No handler found for animation type.") );
1633 return false;
1634 }
1635
83591a68
JB		 1636--- wxWidgets-2.8.12/utils/emulator/src/emulator.cpp.orig 2011-03-22 13:00:37.000000000 +0100
1637+++ wxWidgets-2.8.12/utils/emulator/src/emulator.cpp 2012-10-02 20:48:39.157273514 +0200
1638@@ -144,9 +144,7 @@
1639 #ifdef __X__
1640 wxLog::SetActiveTarget(new wxLogStderr);
1641 #endif
1642- wxString msg;
1643- msg.Printf(wxT("wxWidgets PDA Emulator (c) Julian Smart, 2002 Version %.2f, %s"), wxEMULATOR_VERSION, __DATE__);
1644- wxLogMessage(msg);
1645+ wxLogMessage(wxT("wxWidgets PDA Emulator (c) Julian Smart, 2002 Version %.2f, %s"), wxEMULATOR_VERSION, __DATE__);
1646 return false;
1647 }
1648 if (parser.Found(wxT("u"), & m_displayNumber))
1649--- wxWidgets-2.8.12/utils/helpview/src/helpview.cpp.orig 2011-03-22 13:00:38.000000000 +0100
1650+++ wxWidgets-2.8.12/utils/helpview/src/helpview.cpp 2012-10-02 20:49:22.497272612 +0200
1651@@ -184,7 +184,7 @@
1652 {
1653 wxString wxm = wxT("Server Create failed - service: ");
1654 wxString xxm = wxm << service;
1655- wxLogError( xxm );
81d7c5cc 1656+ wxLogError(wxT("%s"), xxm.c_str() );
83591a68
JB		 1657 //if MSW quits here, probably another copy already exists
1658 return false;
1659 }
wxWidgets library
This page took 1.666692 seconds and 4 git commands to generate.