disable use of #pragma interface under Mac OS X

[wxWidgets.git] / include / wx / mac / pngread.h

diff --git a/include/wx/mac/pngread.h b/include/wx/mac/pngread.h
index 83ef95baf576c5a1d2ecf3b3ad3a1b006ca124fe..8aa50a09d44520a0f3245db2279f3f46d6283007 100644 (file)
--- a/include/wx/mac/pngread.h
+++ b/include/wx/mac/pngread.h
@@ -11,7 +11,7 @@
 #ifndef _WX_PNGREAD__
 #define _WX_PNGREAD__
 
 #ifndef _WX_PNGREAD__
 #define _WX_PNGREAD__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "pngread.h"
 #endif
 
 #pragma interface "pngread.h"
 #endif
 


@@ -50,9 +50,9 @@ protected:
 
   long EfeWidth;               // Efective Width
 
 
   long EfeWidth;               // Efective Width
 

-  GWorldPtr lpbi;
+  void *lpbi;

   int bgindex;
   int bgindex;

-  wxPalette* Palette;
+  wxPalette* m_palette;

   bool imageOK;
 friend class wxPNGReaderIter;
 public:
   bool imageOK;
 friend class wxPNGReaderIter;
 public:


@@ -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);
   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; }
 
   void NullData();
   inline int GetBGIndex(void) { return bgindex; }