Toolbar/tooltip udates

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

diff --git a/include/wx/mac/pngread.h b/include/wx/mac/pngread.h
index f6d1d707ec0f65a175a4c14325344f57cf328427..2a9307ba9ba433a53d38abd7450cc608b9407977 100644 (file)
--- a/include/wx/mac/pngread.h
+++ b/include/wx/mac/pngread.h
@@ -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; }