Added some Motif wxGLCanvas support; some more Motif bugs cured; print dialogs

[wxWidgets.git] / src / msw / pnghand.cpp

diff --git a/src/msw/pnghand.cpp b/src/msw/pnghand.cpp
index 2fb019783b42bad611343cc1d5e5b76c7d1ffd13..2f82fa3e1079b5eadbac222e86e998e18cc5db58 100644 (file)
--- a/src/msw/pnghand.cpp
+++ b/src/msw/pnghand.cpp
@@ -24,8 +24,19 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+
+#if wxUSE_IOSTREAMH
 #include <fstream.h>
+#else
+#include <fstream>
+#  ifdef _MSC_VER
+      using namespace std;
+#  endif
+#endif
+
 #include <windows.h>
+#include <wx/palette.h>
+#include <wx/bitmap.h>
 #include <wx/msw/pngread.h>
 #include <wx/msw/dibutils.h>
 
@@ -113,7 +124,11 @@ wxPNGReader::Create(int width, int height, int depth, int colortype)
   ColorType = (colortype>=0) ? colortype: ((Depth>8) ? COLORTYPE_COLOR: 0);
 
   if (lpbi)  {
+#ifdef __WIN16__
+        GlobalFreePtr((unsigned int) lpbi);
+#else
         GlobalFreePtr(lpbi);
+#endif
 //      delete Palette;
   }
   RawImage = 0;
@@ -128,7 +143,11 @@ wxPNGReader::Create(int width, int height, int depth, int colortype)
 wxPNGReader::~wxPNGReader ( )
 {
   if (lpbi)  {
+#ifdef __WIN16__
+        GlobalFreePtr((unsigned int) lpbi);
+#else
         GlobalFreePtr(lpbi);
+#endif
         delete Palette;
   }
 }