reverted last commit, still broken for VC6

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

diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp
index 3df7a179793a5ca70bed40a791b80842dfc465da..cba81891160a319f02caeacba742e46ec378df8f 100644 (file)
--- 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
 }
 
@@ -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);