compile fix (still not tested) for GetLastChild()

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

diff --git a/src/msw/dibutils.cpp b/src/msw/dibutils.cpp
index 30dca59100e27fabd4bfb20563b0ebe401873072..6921a9247293b3b6204f78f9d7c7bc97cde0fef1 100644 (file)
--- a/src/msw/dibutils.cpp
+++ b/src/msw/dibutils.cpp
@@ -32,7 +32,9 @@
 #include <wx/msw/dibutils.h>
 
 #if defined(__WIN32__)
+#if !defined(__MWERKS__) && !defined(__SALFORDC__)
     #include <memory.h>             // for _fmemcpy()
+#endif
         #define _huge
 #ifndef hmemcpy
     #define hmemcpy memcpy
@@ -131,7 +133,7 @@ int DibWriteFile(LPSTR szFile, LPBITMAPINFOHEADER lpbi)
   bmf.bfReserved1 = 0;
   bmf.bfReserved2 = 0;
   bmf.bfOffBits = sizeof(bmf) + (char far*)(DibPtr(lpbi)) - (char far*)lpbi;
-#if defined( __WATCOMC__) || defined(_MSC_VER)
+#if defined( __WATCOMC__) || defined(_MSC_VER) || defined(__SC__) || defined(__SALFORDC__)
   if (_hwrite(fh, (LPCSTR)(&bmf), sizeof(bmf))<0 ||
        _hwrite(fh, (LPCSTR)lpbi, size)<0) {
          _lclose(fh);
@@ -173,9 +175,13 @@ PDIB DibOpenFile(LPSTR szFile)
                  HRSRC h;
 
           // TODO: Unicode version
+#ifdef __WIN16__
+                 h = FindResource(GetCurrentInstance(), szFile, RT_BITMAP);
+#else
                  h = FindResourceA(GetCurrentInstance(), szFile, RT_BITMAP);
+#endif
 
-#if defined(WIN32) || defined(_WIN32)
+#if defined(__WIN32__)
                  //!!! can we call GlobalFree() on this? is it the right format.
                  //!!! can we write to this resource?
                  if (h)