X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..0e2a14e5e30994698f213daf2fc9e3d897846f4d:/src/common/imagpng.cpp

diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp
index c277cf17b7..98d1979572 100644
--- a/src/common/imagpng.cpp
+++ b/src/common/imagpng.cpp
@@ -105,7 +105,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler)
 #if wxUSE_STREAMS
 
 #ifndef PNGLINKAGEMODE
-    #if defined(__WATCOMC__) && ( defined(__WXMSW__) || __WATCOMC__ > 1230 )
+    #if defined(__WATCOMC__) && ( defined(__WXMSW__) || defined(__WXMGL__) )
         // we need an explicit cdecl for Watcom, at least according to
         //
         // http://sf.net/tracker/index.php?func=detail&aid=651492&group_id=9863&atid=109863
@@ -168,14 +168,6 @@ void PNGLINKAGEMODE wx_PNG_stream_writer( png_structp png_ptr, png_bytep data,
     WX_PNG_INFO(png_ptr)->stream.out->Write(data, length);
 }
 
-// from pngerror.c
-// so that the libpng doesn't send anything on stderr
-void
-PNGLINKAGEMODE wx_png_error(png_structp WXUNUSED(png_ptr), png_const_charp message)
-{
-    wxLogFatalError( wxString::FromAscii(message) );
-}
-
 void
 PNGLINKAGEMODE wx_png_warning(png_structp png_ptr, png_const_charp message)
 {
@@ -184,6 +176,17 @@ PNGLINKAGEMODE wx_png_warning(png_structp png_ptr, png_const_charp message)
         wxLogWarning( wxString::FromAscii(message) );
 }
 
+// from pngerror.c
+// so that the libpng doesn't send anything on stderr
+void
+PNGLINKAGEMODE wx_png_error(png_structp WXUNUSED(png_ptr), png_const_charp message)
+{
+    // JS: deliver it to wx_png_warning and don't perform any more actions:
+    // libpng will jump back to the calling function (LoadFile and SaveFile)
+    // and allow it to handle the error
+    wx_png_warning(NULL, message);
+}
+
 } // extern "C"
 
 // ----------------------------------------------------------------------------