compilation fix for gcc4 (patch 1428840)

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

diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp
index 26cabaa71c197710b2bb639a90f129f46e1de1a5..a8355e703a056a588813a8e77b15a8bc57a3a0be 100644 (file)
--- a/src/msw/gdiimage.cpp
+++ b/src/msw/gdiimage.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "gdiimage.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -52,16 +48,7 @@
 #include "wx/file.h"
 
 #include "wx/listimpl.cpp"
 #include "wx/file.h"
 
 #include "wx/listimpl.cpp"

-WX_DEFINE_LIST(wxGDIImageHandlerList);
-
-// ----------------------------------------------------------------------------
-// auxiliary functions
-// ----------------------------------------------------------------------------
-
-#ifdef __WXWINCE__
-// Used in wxBMPFileHandler::LoadFile
-HBITMAP wxLoadBMP(const wxString& filename) ;
-#endif
+WX_DEFINE_LIST(wxGDIImageHandlerList)

 
 // ----------------------------------------------------------------------------
 // private classes
 
 // ----------------------------------------------------------------------------
 // private classes


@@ -160,6 +147,7 @@ public:
     {
     }
 
     {
     }
 

+protected:

     virtual bool LoadIcon(wxIcon *icon,
                           const wxString& name, long flags,
                           int desiredWidth = -1, int desiredHeight = -1);
     virtual bool LoadIcon(wxIcon *icon,
                           const wxString& name, long flags,
                           int desiredWidth = -1, int desiredHeight = -1);


@@ -177,6 +165,7 @@ public:
     {
     }
 
     {
     }
 

+protected:

     virtual bool LoadIcon(wxIcon *icon,
                           const wxString& name, long flags,
                           int desiredWidth = -1, int desiredHeight = -1);
     virtual bool LoadIcon(wxIcon *icon,
                           const wxString& name, long flags,
                           int desiredWidth = -1, int desiredHeight = -1);


@@ -274,7 +263,7 @@ wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& extension,
     while ( node )
     {
         wxGDIImageHandler *handler = node->GetData();
     while ( node )
     {
         wxGDIImageHandler *handler = node->GetData();

-        if ( (handler->GetExtension() = extension) &&
+        if ( (handler->GetExtension() == extension) &&

              (type == -1 || handler->GetType() == type) )
         {
             return handler;
              (type == -1 || handler->GetType() == type) )
         {
             return handler;


@@ -372,15 +361,9 @@ bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap,
 
     wxDIB dib(name);
 
 
     wxDIB dib(name);
 

-    bool ok = dib.IsOk() && bitmap->CopyFromDIB(dib);
-    return ok;
+    return dib.IsOk() && bitmap->CopyFromDIB(dib);

 #else
 #else

-  WXHBITMAP hBitmap = (WXHBITMAP)wxLoadBMP(name);
-  if(hBitmap) {
-      bitmap->SetHBITMAP(hBitmap);
-      return TRUE;
-  }
-    return FALSE;
+    return false;

 #endif
 }
 
 #endif
 }
 


@@ -396,7 +379,7 @@ bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap,
 
     return dib.Save(name);
 #else
 
     return dib.Save(name);
 #else

-    return FALSE;
+    return false;

 #endif
 }
 
 #endif
 }
 


@@ -583,9 +566,12 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
 // private functions
 // ----------------------------------------------------------------------------
 
 // private functions
 // ----------------------------------------------------------------------------
 

-wxSize wxGetHiconSize(HICON hicon)
+wxSize wxGetHiconSize(HICON WXUNUSED_IN_WINCE(hicon))

 {
 {

-    wxSize size(32, 32);    // default
+    // default icon size on this hardware
+    // usually 32x32 but can be other (smaller) on pocket devices
+    wxSize size(::GetSystemMetrics(SM_CXICON), ::GetSystemMetrics(SM_CYICON));
+

 #ifndef __WXWINCE__
     if ( hicon && wxGetOsVersion() != wxWIN32S )
     {
 #ifndef __WXWINCE__
     if ( hicon && wxGetOsVersion() != wxWIN32S )
     {


@@ -612,85 +598,9 @@ wxSize wxGetHiconSize(HICON hicon)
         }
     }
 #endif
         }
     }
 #endif

+

     return size;
 }
 
 #endif // __WXMICROWIN__
 
     return size;
 }
 
 #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))
-        == (off_t)(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
-