Better fix

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

diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp
index f6dc5a9096a1029b20de1de52ab579f884adeaba..ff89f0755b43f1f3707d20bff07c9b4ff3a5d97f 100644 (file)
--- a/src/msw/gdiimage.cpp
+++ b/src/msw/gdiimage.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        msw/gdiimage.cpp
+// Name:        src/msw/gdiimage.cpp

 // Purpose:     wxGDIImage implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxGDIImage implementation
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -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"
 


@@ -31,13 +27,12 @@
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"

+    #include "wx/app.h"
+    #include "wx/bitmap.h"

 #endif // WX_PRECOMP
 
 #include "wx/msw/private.h"
 
 #endif // WX_PRECOMP
 
 #include "wx/msw/private.h"
 

-#include "wx/app.h"
-
-#include "wx/bitmap.h"

 #include "wx/msw/gdiimage.h"
 
 #if wxUSE_WXDIB
 #include "wx/msw/gdiimage.h"
 
 #if wxUSE_WXDIB


@@ -52,16 +47,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


@@ -118,7 +104,7 @@ public:
 
     // creating and saving icons is not supported
     virtual bool Create(wxGDIImage *WXUNUSED(image),
 
     // creating and saving icons is not supported
     virtual bool Create(wxGDIImage *WXUNUSED(image),

-                        void *WXUNUSED(data),
+                        const void* WXUNUSED(data),

                         long WXUNUSED(flags),
                         int WXUNUSED(width),
                         int WXUNUSED(height),
                         long WXUNUSED(flags),
                         int WXUNUSED(width),
                         int WXUNUSED(height),


@@ -160,6 +146,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 +164,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 +262,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;


@@ -335,7 +323,7 @@ bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap,
                                     int WXUNUSED(desiredHeight))
 {
     // TODO: load colourmap.
                                     int WXUNUSED(desiredHeight))
 {
     // TODO: load colourmap.

-    bitmap->SetHBITMAP((WXHBITMAP)::LoadBitmap(wxGetInstance(), name));
+    bitmap->SetHBITMAP((WXHBITMAP)::LoadBitmap(wxGetInstance(), name.wx_str()));

 
     if ( !bitmap->Ok() )
     {
 
     if ( !bitmap->Ok() )
     {


@@ -372,14 +360,8 @@ 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;
 #endif
 }
     return false;
 #endif
 }


@@ -456,7 +438,7 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
          desiredHeight == ::GetSystemMetrics(SM_CYICON) )
     {
         // get the specified large icon from file
          desiredHeight == ::GetSystemMetrics(SM_CYICON) )
     {
         // get the specified large icon from file

-        if ( !::ExtractIconEx(nameReal, iconIndex, &hicon, NULL, 1) )
+        if ( !::ExtractIconEx(nameReal.wx_str(), iconIndex, &hicon, NULL, 1) )

         {
             // it is not an error, but it might still be useful to be informed
             // about it optionally
         {
             // it is not an error, but it might still be useful to be informed
             // about it optionally


@@ -469,7 +451,7 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
               desiredHeight == ::GetSystemMetrics(SM_CYSMICON) )
     {
         // get the specified small icon from file
               desiredHeight == ::GetSystemMetrics(SM_CYSMICON) )
     {
         // get the specified small icon from file

-        if ( !::ExtractIconEx(nameReal, iconIndex, NULL, &hicon, 1) )
+        if ( !::ExtractIconEx(nameReal.wx_str(), iconIndex, NULL, &hicon, 1) )

         {
             wxLogTrace(_T("iconload"),
                        _T("No small icons found in the file '%s'."),
         {
             wxLogTrace(_T("iconload"),
                        _T("No small icons found in the file '%s'."),


@@ -482,7 +464,7 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
     if ( !hicon )
     {
         // take any size icon from the file by index
     if ( !hicon )
     {
         // take any size icon from the file by index

-        hicon = ::ExtractIcon(wxGetInstance(), nameReal, iconIndex);
+        hicon = ::ExtractIcon(wxGetInstance(), nameReal.wx_str(), iconIndex);

     }
 #endif
 
     }
 #endif
 


@@ -536,13 +518,13 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
     // some icon rescaling internally which results in very ugly 16x16 icons
     if ( hasSize )
     {
     // some icon rescaling internally which results in very ugly 16x16 icons
     if ( hasSize )
     {

-        hicon = (HICON)::LoadImage(wxGetInstance(), name, IMAGE_ICON,
+        hicon = (HICON)::LoadImage(wxGetInstance(), name.wx_str(), IMAGE_ICON,

                                     desiredWidth, desiredHeight,
                                     LR_DEFAULTCOLOR);
     }
     else
     {
                                     desiredWidth, desiredHeight,
                                     LR_DEFAULTCOLOR);
     }
     else
     {

-        hicon = ::LoadIcon(wxGetInstance(), name);
+        hicon = ::LoadIcon(wxGetInstance(), name.wx_str());

     }
 
     // next check if it's not a standard icon
     }
 
     // next check if it's not a standard icon


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

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

 {
 {

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

 
 #ifndef __WXWINCE__
 
 #ifndef __WXWINCE__

-    if ( hicon && wxGetOsVersion() != wxWIN32S )
+    if ( hicon )

     {
         ICONINFO info;
         if ( !::GetIconInfo(hicon, &info) )
     {
         ICONINFO info;
         if ( !::GetIconInfo(hicon, &info) )


@@ -614,88 +594,16 @@ wxSize wxGetHiconSize(HICON hicon)
                 ::DeleteObject(info.hbmColor);
         }
     }
                 ::DeleteObject(info.hbmColor);
         }
     }

-#else
-    wxUnusedVar(hicon);
-#endif
-    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))
-        == 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 ( !size.x )
+#endif // !__WXWINCE__
+    {
+        // use default icon size on this hardware
+        size.x = ::GetSystemMetrics(SM_CXICON);
+        size.y = ::GetSystemMetrics(SM_CYICON);

     }
     }

-  }
-
-  if(pBmpInfo)
-    free(pBmpInfo);
-  if(pBits)
-      free(pBits);

 
 

-  return hBitmap;
+    return size;

 }
 }

-#endif

 
 

+#endif // __WXMICROWIN__