]>
Commit | Line | Data |
---|---|---|
c885e705 JB |
1 | --- wxWidgets-2.8.12/src/common/appbase.cpp.orig 2011-03-22 12:59:40.000000000 +0100 |
2 | +++ wxWidgets-2.8.12/src/common/appbase.cpp 2012-09-30 08:02:00.981833952 +0200 | |
3 | @@ -424,7 +424,7 @@ | |
4 | msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."), | |
5 | lib.c_str(), progName.c_str(), prog.c_str()); | |
6 | ||
7 | - wxLogFatalError(msg.c_str()); | |
8 | + wxLogFatalError("%s", msg.c_str()); | |
9 | ||
10 | // normally wxLogFatalError doesn't return | |
11 | return false; | |
47151347 JB |
12 | --- wxWidgets-2.8.12/src/common/fs_mem.cpp.orig 2011-03-22 12:59:41.000000000 +0100 |
13 | +++ wxWidgets-2.8.12/src/common/fs_mem.cpp 2012-09-30 10:11:49.745004943 +0200 | |
14 | @@ -174,9 +174,7 @@ | |
15 | ||
16 | if (m_Hash -> Get(filename) != NULL) | |
17 | { | |
18 | - wxString s; | |
19 | - s.Printf(_("Memory VFS already contains file '%s'!"), filename.c_str()); | |
20 | - wxLogError(s); | |
21 | + wxLogError(_("Memory VFS already contains file '%s'!"), filename.c_str()); | |
22 | return false; | |
23 | } | |
24 | else | |
25 | @@ -226,9 +224,7 @@ | |
26 | if (m_Hash == NULL || | |
27 | m_Hash -> Get(filename) == NULL) | |
28 | { | |
29 | - wxString s; | |
30 | - s.Printf(_("Trying to remove file '%s' from memory VFS, but it is not loaded!"), filename.c_str()); | |
31 | - wxLogError(s); | |
32 | + wxLogError(_("Trying to remove file '%s' from memory VFS, but it is not loaded!"), filename.c_str()); | |
33 | } | |
34 | ||
35 | else | |
91433879 JB |
36 | @@ -261,7 +261,7 @@ |
37 | wxString s; | |
38 | s.Printf(_("Failed to store image '%s' to memory VFS!"), filename.c_str()); | |
39 | wxPrintf(wxT("'%s'\n"), s.c_str()); | |
40 | - wxLogError(s); | |
f7afc4c3 | 41 | + wxLogError("%s", s.c_str()); |
91433879 JB |
42 | } |
43 | } | |
44 | ||
b44bd5fb JB |
45 | --- wxWidgets-2.8.12/src/common/file.cpp.orig 2011-03-22 12:59:40.000000000 +0100 |
46 | +++ wxWidgets-2.8.12/src/common/file.cpp 2012-09-30 08:19:02.785145988 +0200 | |
47 | @@ -513,7 +513,7 @@ | |
48 | if ( chmod( (const char*) m_strTemp.fn_str(), mode) == -1 ) | |
49 | { | |
50 | #ifndef __OS2__ | |
51 | - wxLogSysError(_("Failed to set temporary file permissions")); | |
52 | + wxLogSysError("%s", _("Failed to set temporary file permissions")); | |
53 | #endif | |
54 | } | |
55 | #endif // Unix | |
56 | --- wxWidgets-2.8.12/src/common/fileconf.cpp.orig 2011-03-22 12:59:41.000000000 +0100 | |
57 | +++ wxWidgets-2.8.12/src/common/fileconf.cpp 2012-09-30 08:20:45.761810510 +0200 | |
58 | @@ -508,7 +508,7 @@ | |
59 | ||
60 | if ( err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF ) | |
61 | { | |
62 | - wxLogError(_("Error reading config options.")); | |
63 | + wxLogError("%s", _("Error reading config options.")); | |
64 | break; | |
65 | } | |
66 | } | |
67 | @@ -1043,7 +1043,7 @@ | |
68 | ||
69 | if ( !file.IsOpened() ) | |
70 | { | |
71 | - wxLogError(_("can't open user configuration file.")); | |
72 | + wxLogError("%s", _("can't open user configuration file.")); | |
73 | return false; | |
74 | } | |
75 | ||
76 | @@ -1057,13 +1057,13 @@ | |
77 | ||
78 | if ( !file.Write(filetext, *m_conv) ) | |
79 | { | |
80 | - wxLogError(_("can't write user configuration file.")); | |
81 | + wxLogError("%s", _("can't write user configuration file.")); | |
82 | return false; | |
83 | } | |
84 | ||
85 | if ( !file.Commit() ) | |
86 | { | |
87 | - wxLogError(_("Failed to update user configuration file.")); | |
88 | + wxLogError("%s", _("Failed to update user configuration file.")); | |
89 | ||
90 | return false; | |
91 | } | |
92 | @@ -1090,7 +1090,7 @@ | |
93 | wxCharBuffer buf(line.mb_str(conv)); | |
94 | if ( !os.Write(buf, strlen(buf)) ) | |
95 | { | |
96 | - wxLogError(_("Error saving user configuration data.")); | |
97 | + wxLogError("%s", _("Error saving user configuration data.")); | |
98 | ||
99 | return false; | |
100 | } | |
8de26838 JB |
101 | --- wxWidgets-2.8.12/src/common/filename.cpp.orig 2011-03-22 12:59:41.000000000 +0100 |
102 | +++ wxWidgets-2.8.12/src/common/filename.cpp 2012-09-30 08:26:13.781803673 +0200 | |
103 | @@ -859,7 +859,7 @@ | |
104 | ||
105 | if ( path.empty() ) | |
106 | { | |
107 | - wxLogSysError(_("Failed to create a temporary file name")); | |
108 | + wxLogSysError("%s", _("Failed to create a temporary file name")); | |
109 | } | |
110 | else | |
111 | { | |
112 | @@ -894,7 +894,7 @@ | |
113 | // fails, though of course it should be protected against | |
114 | // possible infinite looping too. | |
115 | ||
116 | - wxLogError(_("Failed to open temporary file.")); | |
117 | + wxLogError("%s", _("Failed to open temporary file.")); | |
118 | ||
119 | path.clear(); | |
120 | } | |
84f99935 JB |
121 | --- wxWidgets-2.8.12/src/common/filefn.cpp.orig 2011-03-22 12:59:41.000000000 +0100 |
122 | +++ wxWidgets-2.8.12/src/common/filefn.cpp 2012-09-30 09:03:28.965090416 +0200 | |
123 | @@ -1513,7 +1513,7 @@ | |
124 | ||
125 | if ( !ok ) | |
126 | { | |
127 | - wxLogSysError(_("Failed to get the working directory")); | |
128 | + wxLogSysError("%s", _("Failed to get the working directory")); | |
129 | ||
130 | // VZ: the old code used to return "." on error which didn't make any | |
131 | // sense at all to me - empty string is a better error indicator | |
3593df53 JB |
132 | --- wxWidgets-2.8.12/src/common/init.cpp.orig 2011-03-22 12:59:41.000000000 +0100 |
133 | +++ wxWidgets-2.8.12/src/common/init.cpp 2012-09-30 09:06:52.951752832 +0200 | |
134 | @@ -237,7 +237,7 @@ | |
135 | ||
136 | if ( !wxModule::InitializeModules() ) | |
137 | { | |
138 | - wxLogError(_("Initialization failed in post init, aborting.")); | |
139 | + wxLogError("%s", _("Initialization failed in post init, aborting.")); | |
140 | return false; | |
141 | } | |
142 | ||
1b84f1e6 JB |
143 | --- wxWidgets-2.8.12/src/common/stopwatch.cpp.orig 2011-03-22 12:59:42.000000000 +0100 |
144 | +++ wxWidgets-2.8.12/src/common/stopwatch.cpp 2012-09-30 09:13:41.768410978 +0200 | |
145 | @@ -228,7 +228,7 @@ | |
146 | if (( t0 != (time_t)-1 ) && ( t1 != (time_t)-1 )) | |
147 | return (long)difftime(t1, t0) + (60 * 60 * 24 * 4); | |
148 | ||
149 | - wxLogSysError(_("Failed to get the local system time")); | |
150 | + wxLogSysError("%s", _("Failed to get the local system time")); | |
151 | return -1; | |
152 | } | |
153 | ||
154 | @@ -286,7 +286,7 @@ | |
155 | } | |
156 | else | |
157 | { | |
158 | - wxLogError(_("wxGetTimeOfDay failed.")); | |
4b62fc1e | 159 | + wxLogError("%s", _("wxGetTimeOfDay failed.")); |
1b84f1e6 JB |
160 | return 0; |
161 | } | |
162 | #elif defined(HAVE_FTIME) | |
fd5caa00 JB |
163 | --- wxWidgets-2.8.12/src/common/tarstrm.cpp.orig 2011-03-22 12:59:42.000000000 +0100 |
164 | +++ wxWidgets-2.8.12/src/common/tarstrm.cpp 2012-09-30 09:40:58.075043539 +0200 | |
165 | @@ -790,7 +790,7 @@ | |
166 | while (!done) { | |
167 | m_hdr->Read(*m_parent_i_stream); | |
168 | if (m_parent_i_stream->Eof()) | |
169 | - wxLogError(_("incomplete header block in tar")); | |
170 | + wxLogError("%s", _("incomplete header block in tar")); | |
171 | if (!*m_parent_i_stream) | |
172 | return wxSTREAM_READ_ERROR; | |
173 | m_offset += TAR_BLOCKSIZE; | |
174 | @@ -813,7 +813,7 @@ | |
175 | if (m_sumType == SUM_SIGNED) | |
176 | ok = chksum == m_hdr->Sum(true); | |
177 | if (!ok) { | |
178 | - wxLogError(_("checksum failure reading tar header block")); | |
179 | + wxLogError("%s", _("checksum failure reading tar header block")); | |
180 | return wxSTREAM_READ_ERROR; | |
181 | } | |
182 | ||
183 | @@ -986,7 +986,7 @@ | |
184 | } | |
185 | ||
186 | if (!ok || recPos < len || size != lastread) { | |
187 | - wxLogWarning(_("invalid data in extended tar header")); | |
188 | + wxLogWarning("%s", _("invalid data in extended tar header")); | |
189 | return false; | |
190 | } | |
191 | ||
192 | @@ -996,7 +996,7 @@ | |
193 | wxFileOffset wxTarInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode) | |
194 | { | |
195 | if (!IsOpened()) { | |
196 | - wxLogError(_("tar entry not open")); | |
197 | + wxLogError("%s", _("tar entry not open")); | |
198 | m_lasterror = wxSTREAM_READ_ERROR; | |
199 | } | |
200 | if (!IsOk()) | |
201 | @@ -1018,7 +1018,7 @@ | |
202 | size_t wxTarInputStream::OnSysRead(void *buffer, size_t size) | |
203 | { | |
204 | if (!IsOpened()) { | |
205 | - wxLogError(_("tar entry not open")); | |
206 | + wxLogError("%s", _("tar entry not open")); | |
207 | m_lasterror = wxSTREAM_READ_ERROR; | |
208 | } | |
209 | if (!IsOk() || !size) | |
210 | @@ -1037,7 +1037,7 @@ | |
211 | } else if (!m_parent_i_stream->IsOk()) { | |
212 | // any other error will have been reported by the underlying stream | |
213 | if (m_parent_i_stream->Eof()) | |
214 | - wxLogError(_("unexpected end of file")); | |
215 | + wxLogError("%s", _("unexpected end of file")); | |
216 | m_lasterror = wxSTREAM_READ_ERROR; | |
217 | } | |
218 | ||
219 | @@ -1371,7 +1371,7 @@ | |
220 | } | |
221 | ||
222 | if (sizePos == wxInvalidOffset || !m_hdr->SetOctal(TAR_SIZE, m_pos)) { | |
223 | - wxLogError(_("incorrect size given for tar entry")); | |
224 | + wxLogError("%s", _("incorrect size given for tar entry")); | |
225 | m_lasterror = wxSTREAM_WRITE_ERROR; | |
226 | return false; | |
227 | } | |
228 | @@ -1492,7 +1492,7 @@ | |
229 | wxFileOffset wxTarOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode) | |
230 | { | |
231 | if (!IsOpened()) { | |
232 | - wxLogError(_("tar entry not open")); | |
233 | + wxLogError("%s", _("tar entry not open")); | |
234 | m_lasterror = wxSTREAM_WRITE_ERROR; | |
235 | } | |
236 | if (!IsOk() || m_datapos == wxInvalidOffset) | |
237 | @@ -1514,7 +1514,7 @@ | |
238 | size_t wxTarOutputStream::OnSysWrite(const void *buffer, size_t size) | |
239 | { | |
240 | if (!IsOpened()) { | |
241 | - wxLogError(_("tar entry not open")); | |
242 | + wxLogError("%s", _("tar entry not open")); | |
243 | m_lasterror = wxSTREAM_WRITE_ERROR; | |
244 | } | |
245 | if (!IsOk() || !size) | |
bdb99308 JB |
246 | --- wxWidgets-2.8.12/src/common/zstream.cpp.orig 2011-03-22 12:59:43.000000000 +0100 |
247 | +++ wxWidgets-2.8.12/src/common/zstream.cpp 2012-09-30 09:47:40.141701824 +0200 | |
248 | @@ -146,7 +146,7 @@ | |
249 | flags = wxZLIB_ZLIB; | |
250 | } | |
251 | else { | |
252 | - wxLogError(_("Gzip not supported by this version of zlib")); | |
253 | + wxLogError("%s", _("Gzip not supported by this version of zlib")); | |
254 | m_lasterror = wxSTREAM_READ_ERROR; | |
255 | return; | |
256 | } | |
257 | @@ -173,7 +173,7 @@ | |
258 | } | |
259 | } | |
260 | ||
261 | - wxLogError(_("Can't initialize zlib inflate stream.")); | |
262 | + wxLogError("%s", _("Can't initialize zlib inflate stream.")); | |
263 | m_lasterror = wxSTREAM_READ_ERROR; | |
264 | } | |
265 | ||
266 | @@ -236,7 +236,7 @@ | |
267 | m_lasterror = wxSTREAM_EOF; | |
268 | else | |
269 | #endif | |
270 | - wxLogError(_("Can't read inflate stream: unexpected EOF in underlying stream.")); | |
271 | + wxLogError("%s", _("Can't read inflate stream: unexpected EOF in underlying stream.")); | |
272 | break; | |
273 | ||
274 | default: | |
275 | @@ -299,7 +299,7 @@ | |
276 | ||
277 | // if gzip is asked for but not supported... | |
278 | if (flags == wxZLIB_GZIP && !CanHandleGZip()) { | |
279 | - wxLogError(_("Gzip not supported by this version of zlib")); | |
280 | + wxLogError("%s", _("Gzip not supported by this version of zlib")); | |
281 | m_lasterror = wxSTREAM_WRITE_ERROR; | |
282 | return; | |
283 | } | |
284 | @@ -327,7 +327,7 @@ | |
285 | } | |
286 | } | |
287 | ||
288 | - wxLogError(_("Can't initialize zlib deflate stream.")); | |
289 | + wxLogError("%s", _("Can't initialize zlib deflate stream.")); | |
290 | m_lasterror = wxSTREAM_WRITE_ERROR; | |
291 | } | |
292 | ||
293 | --- wxWidgets-2.8.12/src/common/zipstrm.cpp.orig 2011-03-22 12:59:42.000000000 +0100 | |
294 | +++ wxWidgets-2.8.12/src/common/zipstrm.cpp 2012-09-30 09:49:19.005033098 +0200 | |
295 | @@ -525,7 +525,7 @@ | |
296 | m_parent_o_stream = &stream; | |
297 | ||
298 | if (deflateReset(m_deflate) != Z_OK) { | |
299 | - wxLogError(_("can't re-initialize zlib deflate stream")); | |
300 | + wxLogError("%s", _("can't re-initialize zlib deflate stream")); | |
301 | m_lasterror = wxSTREAM_WRITE_ERROR; | |
302 | return false; | |
303 | } | |
304 | @@ -550,7 +550,7 @@ | |
305 | m_parent_i_stream = &stream; | |
306 | ||
307 | if (inflateReset(m_inflate) != Z_OK) { | |
308 | - wxLogError(_("can't re-initialize zlib inflate stream")); | |
309 | + wxLogError("%s", _("can't re-initialize zlib inflate stream")); | |
310 | m_lasterror = wxSTREAM_READ_ERROR; | |
311 | return false; | |
312 | } | |
313 | @@ -1269,7 +1269,7 @@ | |
314 | ||
315 | if (m_DiskNumber != 0 || m_StartDisk != 0 || | |
316 | m_EntriesHere != m_TotalEntries) | |
317 | - wxLogWarning(_("assuming this is a multi-part zip concatenated")); | |
318 | + wxLogWarning("%s", _("assuming this is a multi-part zip concatenated")); | |
319 | ||
320 | return true; | |
321 | } | |
322 | @@ -1441,7 +1441,7 @@ | |
323 | // failed, so either this is a non-seekable stream (ok), or not a zip | |
324 | if (m_parentSeekable) { | |
325 | m_lasterror = wxSTREAM_READ_ERROR; | |
326 | - wxLogError(_("invalid zip file")); | |
327 | + wxLogError("%s", _("invalid zip file")); | |
328 | return false; | |
329 | } | |
330 | else { | |
331 | @@ -1484,7 +1484,7 @@ | |
332 | return true; | |
333 | } | |
334 | ||
335 | - wxLogError(_("can't find central directory in zip")); | |
336 | + wxLogError("%s", _("can't find central directory in zip")); | |
337 | m_lasterror = wxSTREAM_READ_ERROR; | |
338 | return false; | |
339 | } | |
340 | @@ -1570,7 +1570,7 @@ | |
341 | return wxSTREAM_EOF; | |
342 | ||
343 | if (m_signature != CENTRAL_MAGIC) { | |
344 | - wxLogError(_("error reading zip central directory")); | |
345 | + wxLogError("%s", _("error reading zip central directory")); | |
346 | return wxSTREAM_READ_ERROR; | |
347 | } | |
348 | ||
349 | @@ -1661,7 +1661,7 @@ | |
350 | } | |
351 | } | |
352 | ||
353 | - wxLogError(_("error reading zip local header")); | |
354 | + wxLogError("%s", _("error reading zip local header")); | |
355 | return wxSTREAM_READ_ERROR; | |
356 | } | |
357 | ||
358 | @@ -1709,7 +1709,7 @@ | |
359 | == wxInvalidOffset) | |
360 | return false; | |
361 | if (ReadSignature() != LOCAL_MAGIC) { | |
362 | - wxLogError(_("bad zipfile offset to entry")); | |
363 | + wxLogError("%s", _("bad zipfile offset to entry")); | |
364 | return false; | |
365 | } | |
366 | } | |
367 | @@ -1776,7 +1776,7 @@ | |
368 | switch (m_entry.GetMethod()) { | |
369 | case wxZIP_METHOD_STORE: | |
370 | if (m_entry.GetSize() == wxInvalidOffset) { | |
371 | - wxLogError(_("stored file length not in Zip header")); | |
372 | + wxLogError("%s", _("stored file length not in Zip header")); | |
373 | break; | |
374 | } | |
375 | m_store->Open(m_entry.GetSize()); | |
376 | @@ -1790,7 +1790,7 @@ | |
377 | return m_inflate; | |
378 | ||
379 | default: | |
380 | - wxLogError(_("unsupported Zip compression method")); | |
381 | + wxLogError("%s", _("unsupported Zip compression method")); | |
382 | } | |
383 | ||
384 | return NULL; | |
385 | @@ -2171,7 +2171,7 @@ | |
386 | } | |
387 | ||
388 | default: | |
389 | - wxLogError(_("unsupported Zip compression method")); | |
390 | + wxLogError("%s", _("unsupported Zip compression method")); | |
391 | } | |
392 | ||
393 | return NULL; | |
0e6feeaf JB |
394 | --- wxWidgets-2.8.12/include/wx/unix/pipe.h.orig 2011-03-22 13:01:28.000000000 +0100 |
395 | +++ wxWidgets-2.8.12/include/wx/unix/pipe.h 2012-09-30 09:52:41.701695539 +0200 | |
396 | @@ -44,7 +44,7 @@ | |
397 | { | |
398 | if ( pipe(m_fds) == -1 ) | |
399 | { | |
400 | - wxLogSysError(_("Pipe creation failed")); | |
401 | + wxLogSysError("%s", _("Pipe creation failed")); | |
402 | ||
403 | return FALSE; | |
404 | } | |
405 | --- wxWidgets-2.8.12/src/unix/baseunix.cpp.orig 2011-03-22 13:01:28.000000000 +0100 | |
406 | +++ wxWidgets-2.8.12/src/unix/baseunix.cpp 2012-09-30 09:53:20.938361388 +0200 | |
407 | @@ -75,7 +75,7 @@ | |
408 | int exitcode = 0; | |
409 | if ( waitpid(execData.pid, &exitcode, 0) == -1 || !WIFEXITED(exitcode) ) | |
410 | { | |
411 | - wxLogSysError(_("Waiting for subprocess termination failed")); | |
412 | + wxLogSysError("%s", _("Waiting for subprocess termination failed")); | |
413 | } | |
414 | ||
415 | return exitcode; | |
0606d3fc JB |
416 | --- wxWidgets-2.8.12/src/unix/snglinst.cpp.orig 2011-03-22 13:01:28.000000000 +0100 |
417 | +++ wxWidgets-2.8.12/src/unix/snglinst.cpp 2012-09-30 10:01:41.101684296 +0200 | |
418 | @@ -267,7 +267,7 @@ | |
419 | // another process managed to open and lock the file and terminate | |
420 | // (erasing it) before we got here, but this should happen so | |
421 | // rarely in practice that we don't care | |
422 | - wxLogError(_("Failed to access lock file.")); | |
423 | + wxLogError("%s", _("Failed to access lock file.")); | |
424 | ||
425 | return false; | |
426 | } | |
427 | @@ -276,7 +276,7 @@ | |
428 | ssize_t count = file.Read(buf, WXSIZEOF(buf)); | |
429 | if ( count == wxInvalidOffset ) | |
430 | { | |
431 | - wxLogError(_("Failed to read PID from lock file.")); | |
432 | + wxLogError("%s", _("Failed to read PID from lock file.")); | |
433 | } | |
434 | else | |
435 | { | |
81a9b85a JB |
436 | --- wxWidgets-2.8.12/src/unix/threadpsx.cpp.orig 2011-03-22 13:01:28.000000000 +0100 |
437 | +++ wxWidgets-2.8.12/src/unix/threadpsx.cpp 2012-09-30 10:06:25.185011707 +0200 | |
438 | @@ -729,7 +729,7 @@ | |
439 | int rc = pthread_setspecific(gs_keySelf, thread); | |
440 | if ( rc != 0 ) | |
441 | { | |
442 | - wxLogSysError(rc, _("Cannot start thread: error writing TLS")); | |
443 | + wxLogSysError(rc, "%s", _("Cannot start thread: error writing TLS")); | |
444 | ||
445 | return (void *)-1; | |
446 | } | |
447 | @@ -907,7 +907,7 @@ | |
448 | // wxLogDebug: it is possible to bring the system to its knees | |
449 | // by creating too many threads and not joining them quite | |
450 | // easily | |
451 | - wxLogError(_("Failed to join a thread, potential memory leak detected - please restart the program")); | |
452 | + wxLogError("%s", _("Failed to join a thread, potential memory leak detected - please restart the program")); | |
453 | } | |
454 | ||
455 | m_shouldBeJoined = false; | |
456 | @@ -1106,7 +1106,7 @@ | |
457 | int policy; | |
458 | if ( pthread_attr_getschedpolicy(&attr, &policy) != 0 ) | |
459 | { | |
460 | - wxLogError(_("Cannot retrieve thread scheduling policy.")); | |
461 | + wxLogError("%s", _("Cannot retrieve thread scheduling policy.")); | |
462 | } | |
463 | ||
464 | #ifdef __VMS__ | |
465 | @@ -1133,7 +1133,7 @@ | |
466 | if ( prio != WXTHREAD_DEFAULT_PRIORITY ) | |
467 | { | |
468 | // notify the programmer that this doesn't work here | |
469 | - wxLogWarning(_("Thread priority setting is ignored.")); | |
470 | + wxLogWarning("%s", _("Thread priority setting is ignored.")); | |
471 | } | |
472 | //else: we have default priority, so don't complain | |
473 | ||
474 | @@ -1433,7 +1433,7 @@ | |
475 | if ( pthread_cancel(m_internal->GetId()) != 0 ) | |
476 | #endif // HAVE_PTHREAD_CANCEL | |
477 | { | |
478 | - wxLogError(_("Failed to terminate a thread.")); | |
479 | + wxLogError("%s", _("Failed to terminate a thread.")); | |
480 | ||
481 | return wxTHREAD_MISC_ERROR; | |
482 | } | |
483 | @@ -1615,7 +1615,7 @@ | |
484 | int rc = pthread_key_create(&gs_keySelf, NULL /* dtor function */); | |
485 | if ( rc != 0 ) | |
486 | { | |
487 | - wxLogSysError(rc, _("Thread module initialization failed: failed to create thread key")); | |
488 | + wxLogSysError(rc, "%s", _("Thread module initialization failed: failed to create thread key")); | |
489 | ||
490 | return false; | |
491 | } | |
feef0db8 JB |
492 | --- wxWidgets-2.8.12/src/common/ftp.cpp.orig 2011-03-22 12:59:41.000000000 +0100 |
493 | +++ wxWidgets-2.8.12/src/common/ftp.cpp 2012-09-30 10:18:44.061662974 +0200 | |
494 | @@ -628,7 +628,7 @@ | |
495 | if ( !sockSrv->WaitForAccept() ) | |
496 | { | |
497 | m_lastError = wxPROTO_CONNERR; | |
498 | - wxLogError(_("Timeout while waiting for FTP server to connect, try passive mode.")); | |
499 | + wxLogError("%s", _("Timeout while waiting for FTP server to connect, try passive mode.")); | |
500 | delete sock; | |
501 | sock = NULL; | |
502 | } | |
503 | @@ -689,7 +689,7 @@ | |
504 | { | |
505 | m_lastError = wxPROTO_PROTERR; | |
506 | delete sockSrv; | |
507 | - wxLogError(_("The FTP server doesn't support the PORT command.")); | |
508 | + wxLogError("%s", _("The FTP server doesn't support the PORT command.")); | |
509 | return NULL; | |
510 | } | |
511 | ||
512 | @@ -701,7 +701,7 @@ | |
513 | { | |
514 | if ( !DoSimpleCommand(_T("PASV")) ) | |
515 | { | |
516 | - wxLogError(_("The FTP server doesn't support passive mode.")); | |
517 | + wxLogError("%s", _("The FTP server doesn't support passive mode.")); | |
518 | return NULL; | |
519 | } | |
520 | ||
fb5aa3ae JB |
521 | --- wxWidgets-2.8.12/src/unix/utilsunx.cpp.orig 2011-03-22 13:01:28.000000000 +0100 |
522 | +++ wxWidgets-2.8.12/src/unix/utilsunx.cpp 2012-09-30 10:28:09.194984528 +0200 | |
523 | @@ -432,7 +432,7 @@ | |
524 | switch ( select(fd + 1, &readfds, NULL, NULL, &tv) ) | |
525 | { | |
526 | case -1: | |
527 | - wxLogSysError(_("Impossible to get child process input")); | |
528 | + wxLogSysError("%s", _("Impossible to get child process input")); | |
529 | // fall through | |
530 | ||
531 | case 0: | |
532 | @@ -543,7 +543,7 @@ | |
533 | #endif | |
534 | if ( pid == -1 ) // error? | |
535 | { | |
536 | - wxLogSysError( _("Fork failed") ); | |
537 | + wxLogSysError("%s", _("Fork failed") ); | |
538 | ||
539 | ARGS_CLEANUP; | |
540 | ||
541 | @@ -596,7 +596,7 @@ | |
542 | dup2(pipeOut[wxPipe::Write], STDOUT_FILENO) == -1 || | |
543 | dup2(pipeErr[wxPipe::Write], STDERR_FILENO) == -1 ) | |
544 | { | |
545 | - wxLogSysError(_("Failed to redirect child process input/output")); | |
546 | + wxLogSysError("%s", _("Failed to redirect child process input/output")); | |
547 | } | |
548 | ||
549 | pipeIn.Close(); | |
550 | @@ -806,7 +806,7 @@ | |
551 | ||
552 | if ( !ok ) | |
553 | { | |
554 | - wxLogSysError(_("Cannot get the hostname")); | |
555 | + wxLogSysError("%s", _("Cannot get the hostname")); | |
556 | } | |
557 | ||
558 | return ok; | |
abcd1fc9 JB |
559 | @@ -842,7 +842,7 @@ |
560 | struct hostent *host = gethostbyname(wxSafeConvertWX2MB(buf)); | |
561 | if ( !host ) | |
562 | { | |
563 | - wxLogSysError(_("Cannot get the official hostname")); | |
564 | + wxLogSysError("%s", _("Cannot get the official hostname")); | |
565 | ||
566 | ok = false; | |
567 | } | |
bec58ce9 JB |
568 | --- wxWidgets-2.8.12/src/common/sckaddr.cpp.orig 2011-03-22 12:59:42.000000000 +0100 |
569 | +++ wxWidgets-2.8.12/src/common/sckaddr.cpp 2012-09-30 10:54:15.261618553 +0200 | |
570 | @@ -141,7 +141,7 @@ | |
571 | // Some people are sometimes fool. | |
572 | if (name.empty()) | |
573 | { | |
574 | - wxLogWarning( _("Trying to solve a NULL hostname: giving up") ); | |
575 | + wxLogWarning("%s", _("Trying to solve a NULL hostname: giving up") ); | |
576 | return false; | |
577 | } | |
578 | m_origHostname = name; | |
bc1a777f JB |
579 | --- wxWidgets-2.8.12/src/common/socket.cpp.orig 2011-03-22 12:59:42.000000000 +0100 |
580 | +++ wxWidgets-2.8.12/src/common/socket.cpp 2012-09-30 10:58:04.798280436 +0200 | |
581 | @@ -409,7 +409,7 @@ | |
582 | ||
583 | if (sig != 0xfeeddead) | |
584 | { | |
585 | - wxLogWarning(_("wxSocket: invalid signature in ReadMsg.")); | |
586 | + wxLogWarning("%s", _("wxSocket: invalid signature in ReadMsg.")); | |
587 | goto exit; | |
588 | } | |
589 | ||
590 | @@ -463,7 +463,7 @@ | |
591 | ||
592 | if (sig != 0xdeadfeed) | |
593 | { | |
594 | - wxLogWarning(_("wxSocket: invalid signature in ReadMsg.")); | |
595 | + wxLogWarning("%s", _("wxSocket: invalid signature in ReadMsg.")); | |
596 | goto exit; | |
597 | } | |
598 | ||
599 | @@ -990,7 +990,7 @@ | |
600 | case GSOCK_CONNECTION: flag = GSOCK_CONNECTION_FLAG; break; | |
601 | case GSOCK_LOST: flag = GSOCK_LOST_FLAG; break; | |
602 | default: | |
603 | - wxLogWarning(_("wxSocket: unknown event!.")); | |
604 | + wxLogWarning("%s", _("wxSocket: unknown event!.")); | |
605 | return; | |
606 | } | |
607 | ||
cb2c7854 JB |
608 | --- wxWidgets-2.8.12/src/unix/displayx11.cpp.orig 2011-03-22 13:01:28.000000000 +0100 |
609 | +++ wxWidgets-2.8.12/src/unix/displayx11.cpp 2012-09-30 15:55:56.814574597 +0200 | |
610 | @@ -208,7 +208,7 @@ | |
611 | } | |
612 | else //OOPS! | |
613 | { | |
614 | - wxLogSysError(_("Failed to enumerate video modes")); | |
615 | + wxLogSysError("%s", _("Failed to enumerate video modes")); | |
616 | } | |
617 | ||
618 | return Modes; | |
619 | @@ -231,7 +231,7 @@ | |
620 | ||
621 | if( !XF86VidModeGetAllModeLines((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()), &nNumModes, &ppXModes) ) | |
622 | { | |
623 | - wxLogSysError(_("Failed to change video mode")); | |
624 | + wxLogSysError("%s", _("Failed to change video mode")); | |
625 | return false; | |
626 | } | |
627 | ||
628 | --- wxWidgets-2.8.12/src/unix/dialup.cpp.orig 2011-03-22 13:01:28.000000000 +0100 | |
629 | +++ wxWidgets-2.8.12/src/unix/dialup.cpp 2012-09-30 15:56:29.271240585 +0200 | |
630 | @@ -353,7 +353,7 @@ | |
631 | return false; | |
632 | if(IsDialing()) | |
633 | { | |
634 | - wxLogError(_("Already dialling ISP.")); | |
635 | + wxLogError("%s", _("Already dialling ISP.")); | |
636 | return false; | |
637 | } | |
638 | wxString cmd; | |
fa974f21 JB |
639 | --- wxWidgets-2.8.12/src/gtk/textctrl.cpp.orig 2011-03-22 13:01:32.000000000 +0100 |
640 | +++ wxWidgets-2.8.12/src/gtk/textctrl.cpp 2012-09-30 16:21:18.987876200 +0200 | |
641 | @@ -1015,7 +1015,7 @@ | |
642 | { | |
643 | // see comment in WriteText() as to why we must warn the user about | |
644 | // this | |
645 | - wxLogWarning(_("Failed to set text in the text control.")); | |
646 | + wxLogWarning("%s", _("Failed to set text in the text control.")); | |
647 | return; | |
648 | } | |
649 | ||
650 | @@ -1072,7 +1072,7 @@ | |
651 | // we must log an error here as losing the text like this can be a | |
652 | // serious problem (e.g. imagine the document edited by user being | |
653 | // empty instead of containing the correct text) | |
654 | - wxLogWarning(_("Failed to insert text in the control.")); | |
655 | + wxLogWarning("%s", _("Failed to insert text in the control.")); | |
656 | return; | |
657 | } | |
658 | ||
e151a3d9 JB |
659 | --- wxWidgets-2.8.12/src/common/docview.cpp.orig 2011-03-22 12:59:40.000000000 +0100 |
660 | +++ wxWidgets-2.8.12/src/common/docview.cpp 2012-09-30 16:43:04.191182329 +0200 | |
661 | @@ -612,7 +612,7 @@ | |
662 | return true; | |
663 | } | |
664 | ||
665 | - wxLogError(_("Sorry, could not open this file.")); | |
666 | + wxLogError("%s", _("Sorry, could not open this file.")); | |
667 | return false; | |
668 | } | |
669 | ||
39e7bb11 JB |
670 | --- wxWidgets-2.8.12/src/common/fontmap.cpp.orig 2011-03-22 12:59:41.000000000 +0100 |
671 | +++ wxWidgets-2.8.12/src/common/fontmap.cpp 2012-09-30 16:47:20.114510328 +0200 | |
672 | @@ -320,7 +320,7 @@ | |
673 | // message | |
674 | if ( encoding == wxFONTENCODING_SYSTEM ) | |
675 | { | |
676 | - wxLogFatalError(_("can't load any font, aborting")); | |
677 | + wxLogFatalError("%s", _("can't load any font, aborting")); | |
678 | ||
679 | // wxLogFatalError doesn't return | |
680 | } | |
25bf4cad JB |
681 | --- wxWidgets-2.8.12/src/common/imagbmp.cpp.orig 2011-03-22 12:59:41.000000000 +0100 |
682 | +++ wxWidgets-2.8.12/src/common/imagbmp.cpp 2012-09-30 16:57:19.711164497 +0200 | |
683 | @@ -88,7 +88,7 @@ | |
684 | if ( !image->Ok() ) | |
685 | { | |
686 | if ( verbose ) | |
687 | - wxLogError(_("BMP: Couldn't save invalid image.")); | |
688 | + wxLogError("%s", _("BMP: Couldn't save invalid image.")); | |
689 | return false; | |
690 | } | |
691 | ||
692 | @@ -122,7 +122,7 @@ | |
693 | ) | |
694 | { | |
695 | if ( verbose ) | |
696 | - wxLogError(_("BMP: wxImage doesn't have own wxPalette.")); | |
697 | + wxLogError("%s", _("BMP: wxImage doesn't have own wxPalette.")); | |
698 | return false; | |
699 | } | |
700 | bpp = 8; | |
701 | @@ -197,7 +197,7 @@ | |
702 | ) | |
703 | { | |
704 | if (verbose) | |
705 | - wxLogError(_("BMP: Couldn't write the file (Bitmap) header.")); | |
706 | + wxLogError("%s", _("BMP: Couldn't write the file (Bitmap) header.")); | |
707 | return false; | |
708 | } | |
709 | } | |
710 | @@ -218,7 +218,7 @@ | |
711 | ) | |
712 | { | |
713 | if (verbose) | |
714 | - wxLogError(_("BMP: Couldn't write the file (BitmapInfo) header.")); | |
715 | + wxLogError("%s", _("BMP: Couldn't write the file (BitmapInfo) header.")); | |
716 | return false; | |
717 | } | |
718 | } | |
719 | @@ -292,7 +292,7 @@ | |
720 | if ( !stream.Write(rgbquad, palette_size*4) ) | |
721 | { | |
722 | if (verbose) | |
723 | - wxLogError(_("BMP: Couldn't write RGB color map.")); | |
724 | + wxLogError("%s", _("BMP: Couldn't write RGB color map.")); | |
725 | delete[] rgbquad; | |
726 | #if wxUSE_PALETTE | |
727 | delete palette; | |
728 | @@ -425,7 +425,7 @@ | |
729 | if ( !stream.Write(buffer, row_width) ) | |
730 | { | |
731 | if (verbose) | |
732 | - wxLogError(_("BMP: Couldn't write data.")); | |
733 | + wxLogError("%s", _("BMP: Couldn't write data.")); | |
734 | delete[] buffer; | |
735 | #if wxUSE_PALETTE | |
736 | delete palette; | |
737 | @@ -471,7 +471,7 @@ | |
738 | if ( !cmap ) | |
739 | { | |
740 | if (verbose) | |
741 | - wxLogError(_("BMP: Couldn't allocate memory.")); | |
742 | + wxLogError("%s", _("BMP: Couldn't allocate memory.")); | |
743 | return false; | |
744 | } | |
745 | } | |
746 | @@ -487,7 +487,7 @@ | |
747 | if ( !ptr ) | |
748 | { | |
749 | if ( verbose ) | |
750 | - wxLogError( _("BMP: Couldn't allocate memory.") ); | |
751 | + wxLogError("%s", _("BMP: Couldn't allocate memory.") ); | |
752 | delete[] cmap; | |
753 | return false; | |
754 | } | |
755 | @@ -501,7 +501,7 @@ | |
756 | if ( !alpha ) | |
757 | { | |
758 | if ( verbose ) | |
759 | - wxLogError(_("BMP: Couldn't allocate memory.")); | |
760 | + wxLogError("%s", _("BMP: Couldn't allocate memory.")); | |
761 | delete[] cmap; | |
762 | return false; | |
763 | } | |
764 | @@ -898,13 +898,13 @@ | |
765 | if ( width > 32767 ) | |
766 | { | |
767 | if (verbose) | |
768 | - wxLogError( _("DIB Header: Image width > 32767 pixels for file.") ); | |
769 | + wxLogError("%s", _("DIB Header: Image width > 32767 pixels for file.") ); | |
770 | return false; | |
771 | } | |
772 | if ( height > 32767 ) | |
773 | { | |
774 | if (verbose) | |
775 | - wxLogError( _("DIB Header: Image height > 32767 pixels for file.") ); | |
776 | + wxLogError("%s", _("DIB Header: Image height > 32767 pixels for file.") ); | |
777 | return false; | |
778 | } | |
779 | ||
780 | @@ -918,7 +918,7 @@ | |
781 | if ( bpp != 1 && bpp != 4 && bpp != 8 && bpp != 16 && bpp != 24 && bpp != 32 ) | |
782 | { | |
783 | if (verbose) | |
784 | - wxLogError( _("DIB Header: Unknown bitdepth in file.") ); | |
785 | + wxLogError("%s", _("DIB Header: Unknown bitdepth in file.") ); | |
786 | return false; | |
787 | } | |
788 | ||
789 | @@ -928,7 +928,7 @@ | |
790 | comp != BI_BITFIELDS ) | |
791 | { | |
792 | if (verbose) | |
793 | - wxLogError( _("DIB Header: Unknown encoding in file.") ); | |
794 | + wxLogError("%s", _("DIB Header: Unknown encoding in file.") ); | |
795 | return false; | |
796 | } | |
797 | ||
798 | @@ -942,7 +942,7 @@ | |
799 | ((comp == BI_BITFIELDS) && (bpp != 16 && bpp != 32))) | |
800 | { | |
801 | if (verbose) | |
802 | - wxLogError( _("DIB Header: Encoding doesn't match bitdepth.") ); | |
803 | + wxLogError("%s", _("DIB Header: Encoding doesn't match bitdepth.") ); | |
804 | return false; | |
805 | } | |
806 | ||
807 | @@ -951,7 +951,7 @@ | |
808 | verbose, IsBmp, true) ) | |
809 | { | |
810 | if (verbose) | |
811 | - wxLogError( _("Error in reading image DIB.") ); | |
812 | + wxLogError("%s", _("Error in reading image DIB.") ); | |
813 | return false; | |
814 | } | |
815 | ||
816 | @@ -964,7 +964,7 @@ | |
817 | verbose, IsBmp, false) ) | |
818 | { | |
819 | if (verbose) | |
820 | - wxLogError( _("ICO: Error in reading mask DIB.") ); | |
821 | + wxLogError("%s", _("ICO: Error in reading mask DIB.") ); | |
822 | return false; | |
823 | } | |
824 | image->SetMaskFromImage(mask, 255, 255, 255); | |
825 | @@ -1037,13 +1037,13 @@ | |
826 | if ( image->GetHeight () > 127 ) | |
827 | { | |
828 | if ( verbose ) | |
829 | - wxLogError(_("ICO: Image too tall for an icon.")); | |
830 | + wxLogError("%s", _("ICO: Image too tall for an icon.")); | |
831 | return false; | |
832 | } | |
833 | if ( image->GetWidth () > 255 ) | |
834 | { | |
835 | if ( verbose ) | |
836 | - wxLogError(_("ICO: Image too wide for an icon.")); | |
837 | + wxLogError("%s", _("ICO: Image too wide for an icon.")); | |
838 | return false; | |
839 | } | |
840 | ||
841 | @@ -1069,7 +1069,7 @@ | |
842 | if ( !stream.IsOk() ) | |
843 | { | |
844 | if ( verbose ) | |
845 | - wxLogError(_("ICO: Error writing the image file!")); | |
846 | + wxLogError("%s", _("ICO: Error writing the image file!")); | |
847 | return false; | |
848 | } | |
849 | ||
850 | @@ -1128,7 +1128,7 @@ | |
851 | if ( !bResult ) | |
852 | { | |
853 | if ( verbose ) | |
854 | - wxLogError(_("ICO: Error writing the image file!")); | |
855 | + wxLogError("%s", _("ICO: Error writing the image file!")); | |
856 | return false; | |
857 | } | |
858 | IsMask = true; | |
859 | @@ -1137,7 +1137,7 @@ | |
860 | if ( !bResult ) | |
861 | { | |
862 | if ( verbose ) | |
863 | - wxLogError(_("ICO: Error writing the image file!")); | |
864 | + wxLogError("%s", _("ICO: Error writing the image file!")); | |
865 | return false; | |
866 | } | |
867 | wxUint32 Size = cStream.GetSize(); | |
868 | @@ -1192,7 +1192,7 @@ | |
869 | if ( !stream.IsOk() ) | |
870 | { | |
871 | if ( verbose ) | |
872 | - wxLogError(_("ICO: Error writing the image file!")); | |
873 | + wxLogError("%s", _("ICO: Error writing the image file!")); | |
874 | return false; | |
875 | } | |
876 | ||
877 | @@ -1202,7 +1202,7 @@ | |
878 | if ( !bResult ) | |
879 | { | |
880 | if ( verbose ) | |
881 | - wxLogError(_("ICO: Error writing the image file!")); | |
882 | + wxLogError("%s", _("ICO: Error writing the image file!")); | |
883 | return false; | |
884 | } | |
885 | IsMask = true; | |
886 | @@ -1211,7 +1211,7 @@ | |
887 | if ( !bResult ) | |
888 | { | |
889 | if ( verbose ) | |
890 | - wxLogError(_("ICO: Error writing the image file!")); | |
891 | + wxLogError("%s", _("ICO: Error writing the image file!")); | |
892 | return false; | |
893 | } | |
894 | ||
895 | @@ -1276,7 +1276,7 @@ | |
896 | ||
897 | if ( iSel == wxNOT_FOUND || iSel < 0 || iSel >= nIcons ) | |
898 | { | |
899 | - wxLogError(_("ICO: Invalid icon index.")); | |
900 | + wxLogError("%s", _("ICO: Invalid icon index.")); | |
901 | bResult = false; | |
902 | } | |
903 | else | |
904 | --- wxWidgets-2.8.12/src/common/image.cpp.orig 2011-03-22 12:59:41.000000000 +0100 | |
905 | +++ wxWidgets-2.8.12/src/common/image.cpp 2012-09-30 16:59:23.204495257 +0200 | |
906 | @@ -1842,7 +1842,7 @@ | |
907 | // check that the images are the same size | |
908 | if ( (M_IMGDATA->m_height != mask.GetHeight() ) || (M_IMGDATA->m_width != mask.GetWidth () ) ) | |
909 | { | |
910 | - wxLogError( _("Image and mask have different sizes.") ); | |
911 | + wxLogError("%s", _("Image and mask have different sizes.") ); | |
912 | return false; | |
913 | } | |
914 | ||
915 | @@ -1850,7 +1850,7 @@ | |
916 | unsigned char r,g,b ; | |
917 | if (!FindFirstUnusedColour(&r, &g, &b)) | |
918 | { | |
919 | - wxLogError( _("No unused colour in image being masked.") ); | |
920 | + wxLogError("%s", _("No unused colour in image being masked.") ); | |
921 | return false ; | |
922 | } | |
923 | ||
924 | @@ -1891,7 +1891,7 @@ | |
925 | unsigned char mr, mg, mb; | |
926 | if (!FindFirstUnusedColour(&mr, &mg, &mb)) | |
927 | { | |
928 | - wxLogError( _("No unused colour in image being masked.") ); | |
929 | + wxLogError("%s", _("No unused colour in image being masked.") ); | |
930 | return false; | |
931 | } | |
932 | ||
933 | @@ -2172,7 +2172,7 @@ | |
934 | ||
935 | } | |
936 | ||
937 | - wxLogWarning(_("No handler found for image type.")); | |
938 | + wxLogWarning("%s", _("No handler found for image type.")); | |
939 | return 0; | |
940 | } | |
941 | ||
942 | @@ -2215,7 +2215,7 @@ | |
943 | ||
944 | } | |
945 | ||
946 | - wxLogWarning( _("No handler found for image type.") ); | |
947 | + wxLogWarning("%s", _("No handler found for image type.") ); | |
948 | return false; | |
949 | } | |
950 | ||
951 | @@ -2696,7 +2696,7 @@ | |
952 | b2++; | |
953 | if ( b2 >= 255 ) | |
954 | { | |
955 | - wxLogError(_("No unused colour in image.") ); | |
956 | + wxLogError("%s",_("No unused colour in image.") ); | |
957 | return false; | |
958 | } | |
959 | } | |
d748e59e JB |
960 | --- wxWidgets-2.8.12/src/common/imaggif.cpp.orig 2011-03-22 12:59:41.000000000 +0100 |
961 | +++ wxWidgets-2.8.12/src/common/imaggif.cpp 2012-09-30 17:04:34.731155430 +0200 | |
962 | @@ -51,13 +51,13 @@ | |
963 | switch (error) | |
964 | { | |
965 | case wxGIF_INVFORMAT: | |
966 | - wxLogError(_("GIF: error in GIF image format.")); | |
967 | + wxLogError("%s", _("GIF: error in GIF image format.")); | |
968 | break; | |
969 | case wxGIF_MEMERR: | |
970 | - wxLogError(_("GIF: not enough memory.")); | |
971 | + wxLogError("%s", _("GIF: not enough memory.")); | |
972 | break; | |
973 | default: | |
974 | - wxLogError(_("GIF: unknown error!!!")); | |
975 | + wxLogError("%s", _("GIF: unknown error!!!")); | |
976 | break; | |
977 | } | |
978 | } | |
979 | @@ -67,7 +67,7 @@ | |
980 | ||
981 | if ((error == wxGIF_TRUNCATED) && verbose) | |
982 | { | |
983 | - wxLogError(_("GIF: data stream seems to be truncated.")); | |
984 | + wxLogError("%s", _("GIF: data stream seems to be truncated.")); | |
985 | /* go on; image data is OK */ | |
986 | } | |
987 | ||
988 | @@ -77,7 +77,7 @@ | |
989 | } | |
990 | else | |
991 | { | |
992 | - wxLogError(_("GIF: Invalid gif index.")); | |
993 | + wxLogError("%s", _("GIF: Invalid gif index.")); | |
994 | } | |
995 | ||
996 | delete decod; | |
b252882f JB |
997 | --- wxWidgets-2.8.12/src/common/imagjpeg.cpp.orig 2011-03-22 12:59:41.000000000 +0100 |
998 | +++ wxWidgets-2.8.12/src/common/imagjpeg.cpp 2012-09-30 18:17:01.807731491 +0200 | |
999 | @@ -247,7 +247,7 @@ | |
1000 | * We need to clean up the JPEG object, close the input file, and return. | |
1001 | */ | |
1002 | if (verbose) | |
1003 | - wxLogError(_("JPEG: Couldn't load - file is probably corrupted.")); | |
1004 | + wxLogError("%s", _("JPEG: Couldn't load - file is probably corrupted.")); | |
1005 | (cinfo.src->term_source)(&cinfo); | |
1006 | jpeg_destroy_decompress(&cinfo); | |
1007 | if (image->Ok()) image->Destroy(); | |
1008 | @@ -390,7 +390,7 @@ | |
1009 | * We need to clean up the JPEG object, close the input file, and return. | |
1010 | */ | |
1011 | if (verbose) | |
1012 | - wxLogError(_("JPEG: Couldn't save image.")); | |
1013 | + wxLogError("%s", _("JPEG: Couldn't save image.")); | |
1014 | jpeg_destroy_compress(&cinfo); | |
1015 | return false; | |
1016 | } | |
1017 | --- wxWidgets-2.8.12/src/common/imagpcx.cpp.orig 2011-03-22 12:59:41.000000000 +0100 | |
1018 | +++ wxWidgets-2.8.12/src/common/imagpcx.cpp 2012-09-30 18:19:28.711061763 +0200 | |
1019 | @@ -439,7 +439,7 @@ | |
1020 | if (!CanRead(stream)) | |
1021 | { | |
1022 | if (verbose) | |
1023 | - wxLogError(_("PCX: this is not a PCX file.")); | |
1024 | + wxLogError("%s", _("PCX: this is not a PCX file.")); | |
1025 | ||
1026 | return false; | |
1027 | } | |
1028 | @@ -452,10 +452,10 @@ | |
1029 | { | |
1030 | switch (error) | |
1031 | { | |
1032 | - case wxPCX_INVFORMAT: wxLogError(_("PCX: image format unsupported")); break; | |
1033 | - case wxPCX_MEMERR: wxLogError(_("PCX: couldn't allocate memory")); break; | |
1034 | - case wxPCX_VERERR: wxLogError(_("PCX: version number too low")); break; | |
1035 | - default: wxLogError(_("PCX: unknown error !!!")); | |
1036 | + case wxPCX_INVFORMAT: wxLogError("%s", _("PCX: image format unsupported")); break; | |
1037 | + case wxPCX_MEMERR: wxLogError("%s", _("PCX: couldn't allocate memory")); break; | |
1038 | + case wxPCX_VERERR: wxLogError("%s", _("PCX: version number too low")); break; | |
1039 | + default: wxLogError("%s", _("PCX: unknown error !!!")); | |
1040 | } | |
1041 | } | |
1042 | image->Destroy(); | |
1043 | @@ -475,9 +475,9 @@ | |
1044 | { | |
1045 | switch (error) | |
1046 | { | |
1047 | - case wxPCX_INVFORMAT: wxLogError(_("PCX: invalid image")); break; | |
1048 | - case wxPCX_MEMERR: wxLogError(_("PCX: couldn't allocate memory")); break; | |
1049 | - default: wxLogError(_("PCX: unknown error !!!")); | |
1050 | + case wxPCX_INVFORMAT: wxLogError("%s", _("PCX: invalid image")); break; | |
1051 | + case wxPCX_MEMERR: wxLogError("%s", _("PCX: couldn't allocate memory")); break; | |
1052 | + default: wxLogError("%s", _("PCX: unknown error !!!")); | |
1053 | } | |
1054 | } | |
1055 | } | |
1056 | --- wxWidgets-2.8.12/src/common/imagpng.cpp.orig 2011-03-22 12:59:41.000000000 +0100 | |
1057 | +++ wxWidgets-2.8.12/src/common/imagpng.cpp 2012-09-30 18:21:56.457725349 +0200 | |
1058 | @@ -175,7 +175,7 @@ | |
1059 | { | |
1060 | wxPNGInfoStruct *info = png_ptr ? WX_PNG_INFO(png_ptr) : NULL; | |
1061 | if ( !info || info->verbose ) | |
1062 | - wxLogWarning( wxString::FromAscii(message) ); | |
1063 | + wxLogWarning("%s", message ); | |
1064 | } | |
1065 | ||
1066 | // from pngerror.c | |
1067 | @@ -293,7 +293,7 @@ | |
1068 | ||
1069 | if ( !h.FindFirstUnusedColour(&rMask, &gMask, &bMask) ) | |
1070 | { | |
1071 | - wxLogWarning(_("Too many colours in PNG, the image may be slightly blurred.")); | |
1072 | + wxLogWarning("%s", _("Too many colours in PNG, the image may be slightly blurred.")); | |
1073 | ||
1074 | // use a fixed mask colour and we'll fudge | |
1075 | // the real pixels with this colour (see | |
1076 | @@ -621,7 +621,7 @@ | |
1077 | ||
1078 | error: | |
1079 | if (verbose) | |
1080 | - wxLogError(_("Couldn't load a PNG image - file is corrupted or not enough memory.")); | |
1081 | + wxLogError("%s", _("Couldn't load a PNG image - file is corrupted or not enough memory.")); | |
1082 | ||
1083 | if ( image->Ok() ) | |
1084 | { | |
1085 | @@ -670,7 +670,7 @@ | |
1086 | if (!png_ptr) | |
1087 | { | |
1088 | if (verbose) | |
1089 | - wxLogError(_("Couldn't save PNG image.")); | |
1090 | + wxLogError("%s", _("Couldn't save PNG image.")); | |
1091 | return false; | |
1092 | } | |
1093 | ||
1094 | @@ -679,7 +679,7 @@ | |
1095 | { | |
1096 | png_destroy_write_struct( &png_ptr, (png_infopp)NULL ); | |
1097 | if (verbose) | |
1098 | - wxLogError(_("Couldn't save PNG image.")); | |
1099 | + wxLogError("%s", _("Couldn't save PNG image.")); | |
1100 | return false; | |
1101 | } | |
1102 | ||
1103 | @@ -687,7 +687,7 @@ | |
1104 | { | |
1105 | png_destroy_write_struct( &png_ptr, (png_infopp)NULL ); | |
1106 | if (verbose) | |
1107 | - wxLogError(_("Couldn't save PNG image.")); | |
1108 | + wxLogError("%s", _("Couldn't save PNG image.")); | |
1109 | return false; | |
1110 | } | |
1111 | ||
ecdad9f8 JB |
1112 | --- wxWidgets-2.8.12/src/common/imagpnm.cpp.orig 2011-03-22 12:59:41.000000000 +0100 |
1113 | +++ wxWidgets-2.8.12/src/common/imagpnm.cpp 2012-09-30 18:26:48.461052596 +0200 | |
1114 | @@ -69,7 +69,7 @@ | |
1115 | case wxT('5'): // RAW Grey | |
1116 | case wxT('6'): break; | |
1117 | default: | |
1118 | - if (verbose) wxLogError(_("PNM: File format is not recognized.")); | |
1119 | + if (verbose) wxLogError("%s", _("PNM: File format is not recognized.")); | |
1120 | return false; | |
1121 | } | |
1122 | ||
1123 | @@ -85,7 +85,7 @@ | |
1124 | if (!ptr) | |
1125 | { | |
1126 | if (verbose) | |
1127 | - wxLogError( _("PNM: Couldn't allocate memory.") ); | |
1128 | + wxLogError("%s", _("PNM: Couldn't allocate memory.") ); | |
1129 | return false; | |
1130 | } | |
1131 | ||
1132 | @@ -103,7 +103,7 @@ | |
1133 | *ptr++=(unsigned char)value; // B | |
1134 | if ( !buf_stream ) | |
1135 | { | |
1136 | - if (verbose) wxLogError(_("PNM: File seems truncated.")); | |
1137 | + if (verbose) wxLogError("%s", _("PNM: File seems truncated.")); | |
1138 | return false; | |
1139 | } | |
1140 | } | |
1141 | @@ -122,7 +122,7 @@ | |
1142 | ||
1143 | if ( !buf_stream ) | |
1144 | { | |
1145 | - if (verbose) wxLogError(_("PNM: File seems truncated.")); | |
1146 | + if (verbose) wxLogError("%s", _("PNM: File seems truncated.")); | |
1147 | return false; | |
1148 | } | |
1149 | } | |
1150 | @@ -141,7 +141,7 @@ | |
1151 | *ptr++=value; // B | |
1152 | if ( !buf_stream ) | |
1153 | { | |
1154 | - if (verbose) wxLogError(_("PNM: File seems truncated.")); | |
1155 | + if (verbose) wxLogError("%s", _("PNM: File seems truncated.")); | |
1156 | return false; | |
1157 | } | |
1158 | } | |
32611bf4 JB |
1159 | --- wxWidgets-2.8.12/src/common/imagtiff.cpp.orig 2011-03-22 12:59:41.000000000 +0100 |
1160 | +++ wxWidgets-2.8.12/src/common/imagtiff.cpp 2012-09-30 18:35:21.521041902 +0200 | |
1161 | @@ -245,7 +245,7 @@ | |
1162 | if (!tif) | |
1163 | { | |
1164 | if (verbose) | |
1165 | - wxLogError( _("TIFF: Error loading image.") ); | |
1166 | + wxLogError("%s", _("TIFF: Error loading image.") ); | |
1167 | ||
1168 | return false; | |
1169 | } | |
1170 | @@ -253,7 +253,7 @@ | |
1171 | if (!TIFFSetDirectory( tif, (tdir_t)index )) | |
1172 | { | |
1173 | if (verbose) | |
1174 | - wxLogError( _("Invalid TIFF image index.") ); | |
1175 | + wxLogError("%s", _("Invalid TIFF image index.") ); | |
1176 | ||
1177 | TIFFClose( tif ); | |
1178 | ||
1179 | @@ -280,7 +280,7 @@ | |
1180 | if ( bytesNeeded >= 4294967295U /* UINT32_MAX */ ) | |
1181 | { | |
1182 | if ( verbose ) | |
1183 | - wxLogError( _("TIFF: Image size is abnormally big.") ); | |
1184 | + wxLogError("%s", _("TIFF: Image size is abnormally big.") ); | |
1185 | ||
1186 | TIFFClose(tif); | |
1187 | ||
1188 | @@ -292,7 +292,7 @@ | |
1189 | if (!raster) | |
1190 | { | |
1191 | if (verbose) | |
1192 | - wxLogError( _("TIFF: Couldn't allocate memory.") ); | |
1193 | + wxLogError("%s", _("TIFF: Couldn't allocate memory.") ); | |
1194 | ||
1195 | TIFFClose( tif ); | |
1196 | ||
1197 | @@ -303,7 +303,7 @@ | |
1198 | if (!image->Ok()) | |
1199 | { | |
1200 | if (verbose) | |
1201 | - wxLogError( _("TIFF: Couldn't allocate memory.") ); | |
1202 | + wxLogError("%s", _("TIFF: Couldn't allocate memory.") ); | |
1203 | ||
1204 | _TIFFfree( raster ); | |
1205 | TIFFClose( tif ); | |
1206 | @@ -317,7 +317,7 @@ | |
1207 | if (!TIFFReadRGBAImage( tif, w, h, raster, 0 )) | |
1208 | { | |
1209 | if (verbose) | |
1210 | - wxLogError( _("TIFF: Error reading image.") ); | |
1211 | + wxLogError("%s", _("TIFF: Error reading image.") ); | |
1212 | ||
1213 | _TIFFfree( raster ); | |
1214 | image->Destroy(); | |
1215 | @@ -385,7 +385,7 @@ | |
1216 | if (!tif) | |
1217 | { | |
1218 | if (verbose) | |
1219 | - wxLogError( _("TIFF: Error saving image.") ); | |
1220 | + wxLogError("%s", _("TIFF: Error saving image.") ); | |
1221 | ||
1222 | return false; | |
1223 | } | |
1224 | @@ -443,7 +443,7 @@ | |
1225 | if (!buf) | |
1226 | { | |
1227 | if (verbose) | |
1228 | - wxLogError( _("TIFF: Couldn't allocate memory.") ); | |
1229 | + wxLogError("%s", _("TIFF: Couldn't allocate memory.") ); | |
1230 | ||
1231 | TIFFClose( tif ); | |
1232 | ||
1233 | @@ -489,7 +489,7 @@ | |
1234 | if ( TIFFWriteScanline(tif, buf ? buf : ptr, (uint32)row, 0) < 0 ) | |
1235 | { | |
1236 | if (verbose) | |
1237 | - wxLogError( _("TIFF: Error writing image.") ); | |
1238 | + wxLogError("%s", _("TIFF: Error writing image.") ); | |
1239 | ||
1240 | TIFFClose( tif ); | |
1241 | if (buf) | |
ccee7a5f JB |
1242 | --- wxWidgets-2.8.12/src/common/textcmn.cpp.orig 2011-03-22 12:59:42.000000000 +0100 |
1243 | +++ wxWidgets-2.8.12/src/common/textcmn.cpp 2012-09-30 18:39:49.751036311 +0200 | |
1244 | @@ -215,7 +215,7 @@ | |
1245 | } | |
1246 | } | |
1247 | ||
1248 | - wxLogError(_("File couldn't be loaded.")); | |
1249 | + wxLogError("%s", _("File couldn't be loaded.")); | |
1250 | #endif // wxUSE_FFILE | |
1251 | ||
1252 | return false; | |
1253 | @@ -251,7 +251,7 @@ | |
1254 | } | |
1255 | #endif // wxUSE_FFILE | |
1256 | ||
1257 | - wxLogError(_("The text couldn't be saved.")); | |
1258 | + wxLogError("%s", _("The text couldn't be saved.")); | |
1259 | ||
1260 | return false; | |
1261 | } | |
d148c13b JB |
1262 | --- wxWidgets-2.8.12/src/common/wincmn.cpp.orig 2011-03-22 12:59:42.000000000 +0100 |
1263 | +++ wxWidgets-2.8.12/src/common/wincmn.cpp 2012-09-30 18:43:17.657698645 +0200 | |
1264 | @@ -1552,7 +1552,7 @@ | |
1265 | wxValidator *validator = child->GetValidator(); | |
1266 | if ( validator && !validator->TransferToWindow() ) | |
1267 | { | |
1268 | - wxLogWarning(_("Could not transfer data to window")); | |
1269 | + wxLogWarning("%s", _("Could not transfer data to window")); | |
1270 | #if wxUSE_LOG | |
1271 | wxLog::FlushActive(); | |
1272 | #endif // wxUSE_LOG | |
1273 | --- wxWidgets-2.8.12/src/common/xpmdecod.cpp.orig 2011-03-22 12:59:42.000000000 +0100 | |
1274 | +++ wxWidgets-2.8.12/src/common/xpmdecod.cpp 2012-09-30 18:44:05.621030978 +0200 | |
1275 | @@ -680,7 +680,7 @@ | |
1276 | &width, &height, &colors_cnt, &chars_per_pixel); | |
1277 | if ( count != 4 || width * height * colors_cnt == 0 ) | |
1278 | { | |
1279 | - wxLogError(_("XPM: incorrect header format!")); | |
1280 | + wxLogError("%s", _("XPM: incorrect header format!")); | |
1281 | return wxNullImage; | |
1282 | } | |
1283 | ||
1284 | @@ -792,7 +792,7 @@ | |
1285 | entry = clr_tbl.find(key); | |
1286 | if ( entry == end ) | |
1287 | { | |
1288 | - wxLogError(_("XPM: Malformed pixel data!")); | |
1289 | + wxLogError("%s", _("XPM: Malformed pixel data!")); | |
1290 | ||
1291 | // better return right now as otherwise we risk to flood the | |
1292 | // user with error messages as something seems to be seriously | |
457caf74 JB |
1293 | --- wxWidgets-2.8.12/src/generic/dcpsg.cpp.orig 2011-03-22 12:59:43.000000000 +0100 |
1294 | +++ wxWidgets-2.8.12/src/generic/dcpsg.cpp 2012-09-30 18:47:32.884359991 +0200 | |
1295 | @@ -1583,7 +1583,7 @@ | |
1296 | ||
1297 | if (!m_pstream) | |
1298 | { | |
1299 | - wxLogError( _("Cannot open file for PostScript printing!")); | |
1300 | + wxLogError("%s", _("Cannot open file for PostScript printing!")); | |
1301 | m_ok = false; | |
1302 | return false; | |
1303 | } | |
866b5c98 JB |
1304 | --- wxWidgets-2.8.12/src/generic/logg.cpp.orig 2011-03-22 12:59:43.000000000 +0100 |
1305 | +++ wxWidgets-2.8.12/src/generic/logg.cpp 2012-09-30 19:07:07.851002168 +0200 | |
1306 | @@ -572,7 +572,7 @@ | |
1307 | bOk = file.Close(); | |
1308 | ||
1309 | if ( !bOk ) { | |
1310 | - wxLogError(_("Can't save log contents to file.")); | |
1311 | + wxLogError("%s", _("Can't save log contents to file.")); | |
1312 | } | |
1313 | else { | |
1314 | wxLogStatus(this, _("Log saved to the file '%s'."), filename.c_str()); | |
1315 | @@ -1023,7 +1023,7 @@ | |
1316 | ok = file.Close(); | |
1317 | ||
1318 | if ( !ok ) | |
1319 | - wxLogError(_("Can't save log contents to file.")); | |
1320 | + wxLogError("%s", _("Can't save log contents to file.")); | |
1321 | #endif // wxUSE_FILEDLG | |
1322 | } | |
1323 | ||
d5909123 JB |
1324 | --- wxWidgets-2.8.12/src/generic/printps.cpp.orig 2011-03-22 12:59:43.000000000 +0100 |
1325 | +++ wxWidgets-2.8.12/src/generic/printps.cpp 2012-09-30 19:41:36.954292375 +0200 | |
1326 | @@ -178,7 +178,7 @@ | |
1327 | if (!printout->OnBeginDocument(m_printDialogData.GetFromPage(), m_printDialogData.GetToPage())) | |
1328 | { | |
1329 | wxEndBusyCursor(); | |
1330 | - wxLogError(_("Could not start printing.")); | |
1331 | + wxLogError("%s", _("Could not start printing.")); | |
1332 | sm_lastError = wxPRINTER_ERROR; | |
1333 | break; | |
1334 | } | |
8f21f644 JB |
1335 | --- wxWidgets-2.8.12/src/unix/sound.cpp.orig 2011-03-22 13:01:28.000000000 +0100 |
1336 | +++ wxWidgets-2.8.12/src/unix/sound.cpp 2012-09-30 20:03:09.254265441 +0200 | |
1337 | @@ -490,7 +490,7 @@ | |
1338 | Free(); | |
1339 | if (!LoadWAV(data, size, true)) | |
1340 | { | |
1341 | - wxLogError(_("Sound data are in unsupported format.")); | |
1342 | + wxLogError("%s", _("Sound data are in unsupported format.")); | |
1343 | return false; | |
1344 | } | |
1345 | return true; | |
e9f238d5 JB |
1346 | --- wxWidgets-2.8.12/src/html/chm.cpp.orig 2011-03-22 12:59:44.000000000 +0100 |
1347 | +++ wxWidgets-2.8.12/src/html/chm.cpp 2012-09-30 20:31:12.494230355 +0200 | |
1348 | @@ -798,7 +798,7 @@ | |
1349 | ||
1350 | if ( GetProtocol(left) != _T("file") ) | |
1351 | { | |
1352 | - wxLogError(_("CHM handler currently supports only local files!")); | |
1353 | + wxLogError("%s", _("CHM handler currently supports only local files!")); | |
1354 | return NULL; | |
1355 | } | |
1356 | ||
1357 | @@ -821,7 +821,7 @@ | |
1358 | if ( (index=right.Index(_T("//"))) != wxNOT_FOUND ) | |
1359 | { | |
1360 | right=wxString(right.Mid(index+1)); | |
1361 | - wxLogWarning(_("Link contained '//', converted to absolute link.")); | |
1362 | + wxLogWarning("%s", _("Link contained '//', converted to absolute link.")); | |
1363 | } | |
1364 | ||
1365 | wxFileName leftFilename = wxFileSystem::URLToFileName(left); | |
4620993b JB |
1366 | @@ -859,7 +859,7 @@ |
1367 | ||
1368 | if ( GetProtocol(left) != _T("file") ) | |
1369 | { | |
1370 | - wxLogError(_("CHM handler currently supports only local files!")); | |
1371 | + wxLogError("%s", _("CHM handler currently supports only local files!")); | |
1372 | return wxEmptyString; | |
1373 | } | |
1374 | ||
a34551fe JB |
1375 | --- wxWidgets-2.8.12/src/html/helpwnd.cpp.orig 2011-03-22 12:59:44.000000000 +0100 |
1376 | +++ wxWidgets-2.8.12/src/html/helpwnd.cpp 2012-09-30 20:54:46.604200882 +0200 | |
1377 | @@ -1553,7 +1553,7 @@ | |
1378 | if (m_Printer == NULL) | |
1379 | m_Printer = new wxHtmlEasyPrinting(_("Help Printing"), this); | |
1380 | if (!m_HtmlWin->GetOpenedPage()) | |
1381 | - wxLogWarning(_("Cannot print empty page.")); | |
1382 | + wxLogWarning("%s", _("Cannot print empty page.")); | |
1383 | else | |
1384 | m_Printer->PrintFile(m_HtmlWin->GetOpenedPage()); | |
1385 | } | |
eee3f0ac JB |
1386 | --- wxWidgets-2.8.12/src/html/htmlpars.cpp.orig 2011-03-22 12:59:44.000000000 +0100 |
1387 | +++ wxWidgets-2.8.12/src/html/htmlpars.cpp 2012-09-30 20:58:05.014196745 +0200 | |
1388 | @@ -382,7 +382,7 @@ | |
1389 | #endif // wxUSE_STL/!wxUSE_STL | |
1390 | ) | |
1391 | { | |
1392 | - wxLogWarning(_("Warning: attempt to remove HTML tag handler from empty stack.")); | |
1393 | + wxLogWarning("%s", _("Warning: attempt to remove HTML tag handler from empty stack.")); | |
1394 | return; | |
1395 | } | |
1396 | m_HandlersHash = *((wxHashTable*) first->GetData()); | |
75cebd42 JB |
1397 | --- wxWidgets-2.8.12/src/html/htmprint.cpp.orig 2011-03-22 12:59:44.000000000 +0100 |
1398 | +++ wxWidgets-2.8.12/src/html/htmprint.cpp 2012-09-30 21:01:26.160859220 +0200 | |
1399 | @@ -307,7 +307,7 @@ | |
1400 | ||
1401 | if (ff == NULL) | |
1402 | { | |
1403 | - wxLogError(htmlfile + _(": file does not exist!")); | |
1404 | + wxLogError("%s", (htmlfile + _(": file does not exist!")).c_str()); | |
1405 | return; | |
1406 | } | |
1407 | ||
1408 | @@ -615,7 +615,7 @@ | |
1409 | { | |
1410 | if (!GetPrintData()->Ok()) | |
1411 | { | |
1412 | - wxLogError(_("There was a problem during page setup: you may need to set a default printer.")); | |
1413 | + wxLogError("%s", _("There was a problem during page setup: you may need to set a default printer.")); | |
1414 | return; | |
1415 | } | |
1416 | ||
f7400821 JB |
1417 | --- wxWidgets-2.8.12/src/common/debugrpt.cpp.orig 2011-03-22 12:59:40.000000000 +0100 |
1418 | +++ wxWidgets-2.8.12/src/common/debugrpt.cpp 2012-09-30 21:10:30.830847867 +0200 | |
1419 | @@ -206,7 +206,7 @@ | |
1420 | if ( !wxMkdir(m_dir, 0700) ) | |
1421 | { | |
1422 | wxLogSysError(_("Failed to create directory \"%s\""), m_dir.c_str()); | |
1423 | - wxLogError(_("Debug report couldn't be created.")); | |
1424 | + wxLogError("%s", _("Debug report couldn't be created.")); | |
1425 | ||
1426 | Reset(); | |
1427 | } | |
1428 | @@ -542,7 +542,7 @@ | |
1429 | { | |
1430 | if ( !GetFilesCount() ) | |
1431 | { | |
1432 | - wxLogError(_("Debug report generation has failed.")); | |
1433 | + wxLogError("%s", _("Debug report generation has failed.")); | |
1434 | ||
1435 | return false; | |
1436 | } | |
1437 | @@ -669,7 +669,7 @@ | |
1438 | errors); | |
1439 | if ( rc == -1 ) | |
1440 | { | |
1441 | - wxLogError(_("Failed to execute curl, please install it in PATH.")); | |
1442 | + wxLogError("%s", _("Failed to execute curl, please install it in PATH.")); | |
1443 | } | |
1444 | else if ( rc != 0 ) | |
1445 | { |