removed spaces; added WXDLLEXPORTs; make overlay classes non copiable

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

diff --git a/include/wx/os2/pngread.h b/include/wx/os2/pngread.h
index fbc2afdf1f53bbe13ed50d7e2c74ec9beac56a2a..5c46dc9eb7180929f7c98d9d3e61e1920393b4b3 100644 (file)
--- a/include/wx/os2/pngread.h
+++ b/include/wx/os2/pngread.h
@@ -46,7 +46,7 @@ protected:
 
   long EfeWidth;                    // Efective Width
 
-  LPBITMAPINFOHEADER lpbi;
+  BITMAPINFOHEADER2* lpbi;
   int bgindex;
   wxPalette* Palette;
   bool imageOK;
@@ -88,7 +88,8 @@ public:
   virtual bool InstantiateBitmap(wxBitmap *bitmap);
   wxMask *CreateMask(void);
 
-  inline bool Ok(void) { return imageOK; }
+  inline bool Ok() const { return IsOk(); }
+  inline bool IsOk(void) { return imageOK; }
 };
 
 class wxPNGReaderIter
@@ -270,7 +271,7 @@ inline bool wxPNGReaderIter::PrevStep()
   Itx -= Stepx;
   if (Itx >= 0)
      return 1;
-  else {       
+  else {
      Ity -= Stepy;
      if (Ity >= 0 && Ity < ima->Height)
      {