Preserve logging state during QT plugin initialization.

[wxWidgets.git] / src / common / imagtiff.cpp

diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp
index 749f744de0c1d6664e921a54048dc7120c784d7b..e1cfedc79523e63119b527eb5eeb1c18b19367ec 100644 (file)
--- a/src/common/imagtiff.cpp
+++ b/src/common/imagtiff.cpp
@@ -140,16 +140,28 @@ static void
 TIFFwxWarningHandler(const char* module, const char* fmt, va_list ap)
 {
     if (module != NULL)
 TIFFwxWarningHandler(const char* module, const char* fmt, va_list ap)
 {
     if (module != NULL)

-            wxLogWarning(_("tiff module: %s"), module);
-    wxVLogWarning((wxChar *) fmt, ap);
+        wxLogWarning(_("tiff module: %s"), wxString::FromAscii(module).c_str());
+
+    // FIXME: this is not terrible informative but better than crashing!
+#if wxUSE_UNICODE
+    wxLogWarning(_("TIFF library warning."));
+#else
+    wxVLogWarning(fmt, ap);
+#endif

 }
 
 static void
 TIFFwxErrorHandler(const char* module, const char* fmt, va_list ap)
 {
     if (module != NULL)
 }
 
 static void
 TIFFwxErrorHandler(const char* module, const char* fmt, va_list ap)
 {
     if (module != NULL)

-            wxLogError(_("tiff module: %s"), module);
-    wxVLogError((wxChar *) fmt, ap);
+        wxLogError(_("tiff module: %s"), wxString::FromAscii(module).c_str());
+
+    // FIXME: as above
+#if wxUSE_UNICODE
+    wxLogError(_("TIFF library error."));
+#else
+    wxVLogError(fmt, ap);
+#endif

 }
 
 } // extern "C"
 }
 
 } // extern "C"