X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/30984deafc05d7c6f88db736336fe73d23a08e19..908f91bce9bfe08204447ed7217a38625ecacc64:/src/msw/gdiimage.cpp

diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp
index f6dc5a9096..f2e84134d0 100644
--- a/src/msw/gdiimage.cpp
+++ b/src/msw/gdiimage.cpp
@@ -54,15 +54,6 @@
 #include "wx/listimpl.cpp"
 WX_DEFINE_LIST(wxGDIImageHandlerList);
 
-// ----------------------------------------------------------------------------
-// auxiliary functions
-// ----------------------------------------------------------------------------
-
-#ifdef __WXWINCE__
-// Used in wxBMPFileHandler::LoadFile
-HBITMAP wxLoadBMP(const wxString& filename) ;
-#endif
-
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
@@ -160,6 +151,7 @@ public:
     {
     }
 
+protected:
     virtual bool LoadIcon(wxIcon *icon,
                           const wxString& name, long flags,
                           int desiredWidth = -1, int desiredHeight = -1);
@@ -177,6 +169,7 @@ public:
     {
     }
 
+protected:
     virtual bool LoadIcon(wxIcon *icon,
                           const wxString& name, long flags,
                           int desiredWidth = -1, int desiredHeight = -1);
@@ -274,7 +267,7 @@ wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& extension,
     while ( node )
     {
         wxGDIImageHandler *handler = node->GetData();
-        if ( (handler->GetExtension() = extension) &&
+        if ( (handler->GetExtension() == extension) &&
              (type == -1 || handler->GetType() == type) )
         {
             return handler;
@@ -372,14 +365,8 @@ bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap,
 
     wxDIB dib(name);
 
-    bool ok = dib.IsOk() && bitmap->CopyFromDIB(dib);
-    return ok;
+    return dib.IsOk() && bitmap->CopyFromDIB(dib);
 #else
-  WXHBITMAP hBitmap = (WXHBITMAP)wxLoadBMP(name);
-  if(hBitmap) {
-      bitmap->SetHBITMAP(hBitmap);
-      return true;
-  }
     return false;
 #endif
 }
@@ -622,80 +609,3 @@ wxSize wxGetHiconSize(HICON hicon)
 
 #endif // __WXMICROWIN__
 
-#ifdef __WXWINCE__
-// Used in wxBMPFileHandler::LoadFile
-HBITMAP wxLoadBMP(const wxString& filename)
-{
-  wxFile file;
-  if(!file.Open(filename))
-        return 0;
-
-    // The first part of the file contains the file header.
-  // This will tell us if it is a bitmap, how big the header is, and how big
-    // the file is. The header size in the file header includes the color table.
-  BITMAPFILEHEADER BmpFileHdr;
-  BITMAPINFO *pBmpInfo = (BITMAPINFO*)malloc(sizeof(BITMAPINFO)+255*sizeof(RGBQUAD));
-  BYTE* pBits = 0;
-  HBITMAP hBitmap = 0;
-
-  if(file.Read(&BmpFileHdr, sizeof(BmpFileHdr))==sizeof(BmpFileHdr)
-    && !strncmp((char*)&BmpFileHdr.bfType,"BM",2)
-    && file.Read(pBmpInfo, sizeof(BITMAPINFOHEADER))==sizeof(BITMAPINFOHEADER)
-    && pBmpInfo->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) {
-
-
-      unsigned int nColors = pBmpInfo->bmiHeader.biClrUsed ?
-      pBmpInfo->bmiHeader.biClrUsed : 1 << pBmpInfo->bmiHeader.biBitCount;
-    if (nColors < 1
-      || file.Read(pBmpInfo->bmiColors, nColors * sizeof(RGBQUAD))
-        == nColors * sizeof(RGBQUAD)) {
-
-      // So how big the bitmap surface is.
-      int nBitsSize = BmpFileHdr.bfSize - BmpFileHdr.bfOffBits;
-
-        // Allocate the memory for the bits and read the bits from the file.
-      pBits = (BYTE*) malloc(nBitsSize*2);
-      if (pBits) {
-        // Seek to the bits in the file.
-        file.Seek(BmpFileHdr.bfOffBits);
-
-        // read the bits
-        if(file.Read(pBits, nBitsSize)==nBitsSize) {
-          // Everything went OK.
-          pBmpInfo->bmiHeader.biSizeImage = nBitsSize;
-
-          //HBITMAP hBitmap=SetBitmap((LPBITMAPINFO)pBmpInfo, pBits);
-          //DWORD dwBitmapInfoSize = sizeof(BITMAPINFO) + nColors*sizeof(RGBQUAD);
-
-            // Create a DC which will be used to get DIB, then create DIBsection
-            HDC hDC = ::GetDC(NULL);
-          if (hDC) {
-            LPVOID bits;
-            hBitmap = CreateDIBSection(hDC, (const BITMAPINFO*) pBmpInfo,
-              DIB_RGB_COLORS, &bits, NULL, 0);
-            ReleaseDC(0,hDC);
-
-            if (hBitmap) {
-              DWORD dwImageSize = pBmpInfo->bmiHeader.biSizeImage;
-              if (dwImageSize == 0) {
-                int nBytesPerLine = pBmpInfo->bmiHeader.biWidth * pBmpInfo->bmiHeader.biBitCount;
-                nBytesPerLine = ( (nBytesPerLine + 31) & (~31) ) / 8;
-                dwImageSize = nBytesPerLine * pBmpInfo->bmiHeader.biHeight;
-              }
-              memcpy(bits, pBits, dwImageSize);
-            }
-          }
-        }
-      }
-    }
-  }
-
-  if(pBmpInfo)
-    free(pBmpInfo);
-  if(pBits)
-      free(pBits);
-
-  return hBitmap;
-}
-#endif
-