1. wxLoad/SaveFileSelector return "wxString" instead of "char *"

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

diff --git a/src/msw/dibutils.cpp b/src/msw/dibutils.cpp
index 5ad72da4f4fe95665443d25dffeba14f95cc7751..6921a9247293b3b6204f78f9d7c7bc97cde0fef1 100644 (file)
--- a/src/msw/dibutils.cpp
+++ b/src/msw/dibutils.cpp
@@ -32,7 +32,7 @@
 #include <wx/msw/dibutils.h>
 
 #if defined(__WIN32__)
 #include <wx/msw/dibutils.h>
 
 #if defined(__WIN32__)

-#ifndef __MWERKS__
+#if !defined(__MWERKS__) && !defined(__SALFORDC__)

     #include <memory.h>             // for _fmemcpy()
 #endif
         #define _huge
     #include <memory.h>             // for _fmemcpy()
 #endif
         #define _huge


@@ -133,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;
   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);
   if (_hwrite(fh, (LPCSTR)(&bmf), sizeof(bmf))<0 ||
        _hwrite(fh, (LPCSTR)lpbi, size)<0) {
          _lclose(fh);