X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/293d3988da067efcdef968ceead0f74c65b2778c..91b4bd63177025704dd39679a2a7c4198eeb7909:/src/mac/carbon/pnghand.cpp

diff --git a/src/mac/carbon/pnghand.cpp b/src/mac/carbon/pnghand.cpp
index 90b59669f0..1ebf612f17 100644
--- a/src/mac/carbon/pnghand.cpp
+++ b/src/mac/carbon/pnghand.cpp
@@ -31,7 +31,7 @@
 #   include <fstream>
 #endif
 
-#ifndef __WXMAC_X__
+#ifndef __DARWIN__
 #  include <windows.h>
 #endif
 #include "wx/msgdlg.h"
@@ -39,6 +39,7 @@
 #include "wx/bitmap.h"
 #include "wx/mac/pnghand.h"
 #include "wx/mac/pngread.h"
+#include "wx/mac/private.h"
 
 extern "C" {
 #include "png.h"
@@ -116,7 +117,7 @@ wxPNGReader::Create(int width, int height, int depth, int colortype)
 
   if (lpbi)  
   {
-  	wxMacDestroyGWorld( lpbi ) ;
+  	wxMacDestroyGWorld( (GWorldPtr) lpbi ) ;
   }
   lpbi = wxMacCreateGWorld( Width , Height , Depth);
   if (lpbi)
@@ -135,7 +136,7 @@ wxPNGReader::~wxPNGReader ( )
 {
  	delete[] RawImage ;
   if (lpbi)  {
-  	wxMacDestroyGWorld( lpbi ) ;
+  	wxMacDestroyGWorld( (GWorldPtr) lpbi ) ;
   }
   delete m_palette;
 }
@@ -258,7 +259,7 @@ wxPNGReader::SetPalette(int n, rgb_color_struct *rgb_struct)
 void wxPNGReader::NullData()
 {
   if (lpbi)  {
-  	wxMacDestroyGWorld( lpbi ) ;
+  	wxMacDestroyGWorld( (GWorldPtr) lpbi ) ;
   }
   delete m_palette;
   lpbi = NULL;
@@ -512,7 +513,7 @@ bool wxPNGReader::ReadFile(char * ImageFileName)
 		
 		GetGWorld( &origPort , &origDevice ) ;
 		// ignore shapedc
-		SetGWorld( lpbi , NULL ) ;
+		SetGWorld( (GWorldPtr) lpbi , NULL ) ;
 	  do  
 	  {
 	//    (unsigned char *)iter.GetRow();
@@ -823,7 +824,7 @@ bool wxPNGReader::SaveXPM(char *filename, char *name)
     if ( !GetPalette() )
         return FALSE;
 
-    ofstream str(filename);
+    wxSTD ofstream str(filename);
     if ( str.bad() )
         return FALSE;