removed old xpm code

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

diff --git a/src/mac/pnghand.cpp b/src/mac/pnghand.cpp
index 8d6d6544f543f08b6b7c8d35586d0bc87278b569..af7b3a6f99719184168f9d3936b24f9dfcdf1d0f 100644 (file)
--- a/src/mac/pnghand.cpp
+++ b/src/mac/pnghand.cpp
@@ -31,11 +31,14 @@
 #   include <fstream>
 #endif
 
-#include <windows.h>
-#include <wx/palette.h>
-#include <wx/bitmap.h>
-#include <wx/mac/pnghand.h>
-#include <wx/mac/pngread.h>
+#ifndef __WXMAC_X__
+#  include <windows.h>
+#endif
+#include "wx/msgdlg.h"
+#include "wx/palette.h"
+#include "wx/bitmap.h"
+#include "wx/mac/pnghand.h"
+#include "wx/mac/pngread.h"
 
 extern "C" {
 #include "png.h"
@@ -47,7 +50,7 @@ extern "C" void png_write_init PNGARG((png_structp png_ptr));
 extern CTabHandle wxMacCreateColorTable( int numColors ) ;
 extern void wxMacDestroyColorTable( CTabHandle colors )  ;
 extern void wxMacSetColorTableEntry( CTabHandle newColors , int index , int red , int green ,  int blue ) ;
-extern GWorldPtr wxMacCreateGWorld( int height , int width , int depth ) ;
+extern GWorldPtr wxMacCreateGWorld( int width , int height , int depth ) ;
 extern void wxMacDestroyGWorld( GWorldPtr gw ) ;
 
 void
@@ -115,7 +118,8 @@ wxPNGReader::Create(int width, int height, int depth, int colortype)
   {
        wxMacDestroyGWorld( lpbi ) ;
   }
-  if (lpbi = wxMacCreateGWorld( Width , Height , Depth) )
+  lpbi = wxMacCreateGWorld( Width , Height , Depth);
+  if (lpbi)
   {
     EfeWidth = (long)(((long)Width*Depth + 31) / 32) * 4;
     int bitwidth = width ;
@@ -410,7 +414,11 @@ bool wxPNGReader::ReadFile(char * ImageFileName)
   wxPNGReaderIter iter(this);
 
   /* open the file */
+#ifndef __UNIX__
   fp = fopen(wxUnix2MacFilename( ImageFileName ), "rb");
+#else
+  fp = fopen( ImageFileName , "rb" );
+#endif
   if (!fp)
     return FALSE;