X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7010702f631a71afdb7beef50fcb4857db0cc5a2..884a37aed25b5cdabcc6f9f7604878aa97ecb031:/src/msw/gdiimage.cpp?ds=sidebyside

diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp
index 3df7a17979..eafa9af40f 100644
--- a/src/msw/gdiimage.cpp
+++ b/src/msw/gdiimage.cpp
@@ -378,9 +378,9 @@ bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap,
   WXHBITMAP hBitmap = (WXHBITMAP)wxLoadBMP(name);
   if(hBitmap) {
       bitmap->SetHBITMAP(hBitmap);
-      return TRUE;
+      return true;
   }
-    return FALSE;
+    return false;
 #endif
 }
 
@@ -396,7 +396,7 @@ bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap,
 
     return dib.Save(name);
 #else
-    return FALSE;
+    return false;
 #endif
 }
 
@@ -648,7 +648,7 @@ HBITMAP wxLoadBMP(const wxString& filename)
       pBmpInfo->bmiHeader.biClrUsed : 1 << pBmpInfo->bmiHeader.biBitCount;
     if (nColors < 1
       || file.Read(pBmpInfo->bmiColors, nColors * sizeof(RGBQUAD))
-        == (off_t)(nColors * sizeof(RGBQUAD))) {
+        == (ssize_t)(nColors * sizeof(RGBQUAD))) {
 
       // So how big the bitmap surface is.
       int nBitsSize = BmpFileHdr.bfSize - BmpFileHdr.bfOffBits;
@@ -665,7 +665,7 @@ HBITMAP wxLoadBMP(const wxString& filename)
           pBmpInfo->bmiHeader.biSizeImage = nBitsSize;
 
           //HBITMAP hBitmap=SetBitmap((LPBITMAPINFO)pBmpInfo, pBits);
-            DWORD dwBitmapInfoSize = sizeof(BITMAPINFO) + nColors*sizeof(RGBQUAD);
+          //DWORD dwBitmapInfoSize = sizeof(BITMAPINFO) + nColors*sizeof(RGBQUAD);
 
             // Create a DC which will be used to get DIB, then create DIBsection
             HDC hDC = ::GetDC(NULL);