Correct compilation conditions for wxURL::SetProxy.

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

diff --git a/include/wx/os2/pngread.h b/include/wx/os2/pngread.h
index fbc2afdf1f53bbe13ed50d7e2c74ec9beac56a2a..d4cf0361f1d5d2963ea6f765084dd4dc593eb4fd 100644 (file)
--- a/include/wx/os2/pngread.h
+++ b/include/wx/os2/pngread.h
@@ -46,7 +46,7 @@ protected:
 
   long EfeWidth;                    // Efective Width
 
 
   long EfeWidth;                    // Efective Width
 

-  LPBITMAPINFOHEADER lpbi;
+  BITMAPINFOHEADER2* lpbi;

   int bgindex;
   wxPalette* Palette;
   bool imageOK;
   int bgindex;
   wxPalette* Palette;
   bool imageOK;


@@ -270,7 +270,7 @@ inline bool wxPNGReaderIter::PrevStep()
   Itx -= Stepx;
   if (Itx >= 0)
      return 1;
   Itx -= Stepx;
   if (Itx >= 0)
      return 1;

-  else {       
+  else {

      Ity -= Stepy;
      if (Ity >= 0 && Ity < ima->Height)
      {
      Ity -= Stepy;
      if (Ity >= 0 && Ity < ima->Height)
      {