X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef6bd27b357788fa1ea5126824e72e1e277e8e4e..7b108a5e8cae8552840b532e364536e2dbe47dc7:/include/wx/mac/pngread.h

diff --git a/include/wx/mac/pngread.h b/include/wx/mac/pngread.h
index f6d1d707ec..8aa50a09d4 100644
--- a/include/wx/mac/pngread.h
+++ b/include/wx/mac/pngread.h
@@ -11,7 +11,7 @@
 #ifndef _WX_PNGREAD__
 #define _WX_PNGREAD__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "pngread.h"
 #endif
 
@@ -40,25 +40,25 @@ class wxPNGReader
 protected:
   int filetype;
   char filename[255];
-  ImagePointerType RawImage;  		//  Image data
+  ImagePointerType RawImage;  	//  Image data
 
-  int Width, Height;   		//  Dimensions
-  int Depth;	 				// (bits x pixel)
-  int ColorType;				// Bit 1 = Palette used
-									// Bit 2 = Color used
-									// Bit 3 = Alpha used
+  int Width, Height;   	        //  Dimensions
+  int Depth;	 		// (bits x pixel)
+  int ColorType;		// Bit 1 = Palette used
+				// Bit 2 = Color used
+				// Bit 3 = Alpha used
 
-  long EfeWidth;	 			// Efective Width
+  long EfeWidth;	 	// Efective Width
 
-  GWorldPtr lpbi;
+  void *lpbi;
   int bgindex;
-  wxPalette* Palette;
+  wxPalette* m_palette;
   bool imageOK;
 friend class wxPNGReaderIter;
 public:
   wxPNGReader(void);
   wxPNGReader (char* ImageFileName);     // Read an image file
-  ~wxPNGReader ();
+  virtual ~wxPNGReader ();
 
   void Create(int width, int height, int deep, int colortype=-1);
 
@@ -80,7 +80,7 @@ public:
   bool SetPalette(wxPalette* colourmap);
   bool SetPalette(int n, rgb_color_struct *rgb_struct);
   bool SetPalette(int n, byte *r, byte *g=0, byte *b=0);
-  wxPalette* GetPalette() const { return Palette; }
+  wxPalette* GetPalette() const { return m_palette; }
 
   void NullData();
   inline int GetBGIndex(void) { return bgindex; }