Fix building wxSTC as a DLL using MinGW GCC 3.x.

[wxWidgets.git] / src / mac / carbon / pnghand.cpp

diff --git a/src/mac/carbon/pnghand.cpp b/src/mac/carbon/pnghand.cpp
index a270cff9e71276abac7a17778572467242d5c0b9..583cbbab7a5c297247bf64d27aa70abf2e660ff8 100644 (file)
--- a/src/mac/carbon/pnghand.cpp
+++ b/src/mac/carbon/pnghand.cpp
@@ -57,7 +57,7 @@ extern void wxMacDestroyGWorld( GWorldPtr gw ) ;
 void
 ima_png_error(png_struct *png_ptr, char *message)
 {
 void
 ima_png_error(png_struct *png_ptr, char *message)
 {

-    wxMessageBox(message, "PNG error");
+    wxMessageBox(wxString::FromAscii(message), wxT("PNG error"));

     longjmp(png_ptr->jmpbuf, 1);
 }
 
     longjmp(png_ptr->jmpbuf, 1);
 }
 


@@ -819,8 +819,9 @@ bool wxPNGReader::SaveXPM(char *filename, char *name)
         strcpy(nameStr, name);
     else
     {
         strcpy(nameStr, name);
     else
     {

-        strcpy(nameStr, filename);
-        wxStripExtension(nameStr);
+       wxString str = wxString::FromAscii(filename) ;
+       wxStripExtension( str ) ;
+        strcpy(nameStr, str.ToAscii() );

     }
     
     if ( GetDepth() > 4 )
     }
     
     if ( GetDepth() > 4 )


@@ -888,7 +889,7 @@ bool wxPNGFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long fla
                                 int desiredWidth, int desiredHeight)
 {
     wxPNGReader reader;
                                 int desiredWidth, int desiredHeight)
 {
     wxPNGReader reader;

-    if (reader.ReadFile((char*) (const char*) name))
+    if (reader.ReadFile( (char*)(const char*) name.ToAscii() ) )

     {
         return reader.InstantiateBitmap(bitmap);
     }
     {
         return reader.InstantiateBitmap(bitmap);
     }