Fix for ambiguities which happen in STL=1 mode under DigitalMars C++.

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

diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp
index 7fb451d303b26555de5ac60f9c9940d724b46f26..f2e84134d0765c6496c2d0d934a720810379e4c4 100644 (file)
--- a/src/msw/gdiimage.cpp
+++ b/src/msw/gdiimage.cpp
@@ -6,7 +6,7 @@
 // Created:     20.11.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "gdiimage.h"
 #endif
 
@@ -37,22 +37,23 @@
 
 #include "wx/app.h"
 
-#ifndef __WXMICROWIN__
+#include "wx/bitmap.h"
+#include "wx/msw/gdiimage.h"
+
+#if wxUSE_WXDIB
 #include "wx/msw/dib.h"
 #endif
 
-#include "wx/msw/bitmap.h"
-#include "wx/msw/gdiimage.h"
-#include "wx/bitmap.h"
+#ifdef __WXWINCE__
+#include <winreg.h>
+#include <shellapi.h>
+#endif
+
+#include "wx/file.h"
 
 #include "wx/listimpl.cpp"
 WX_DEFINE_LIST(wxGDIImageHandlerList);
 
-
-#ifdef __WIN16__
-#   include "wx/msw/curico.h"
-#endif // __WIN16__
-
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
@@ -150,6 +151,7 @@ public:
     {
     }
 
+protected:
     virtual bool LoadIcon(wxIcon *icon,
                           const wxString& name, long flags,
                           int desiredWidth = -1, int desiredHeight = -1);
@@ -167,6 +169,7 @@ public:
     {
     }
 
+protected:
     virtual bool LoadIcon(wxIcon *icon,
                           const wxString& name, long flags,
                           int desiredWidth = -1, int desiredHeight = -1);
@@ -245,7 +248,7 @@ bool wxGDIImage::RemoveHandler(const wxString& name)
 
 wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& name)
 {
-    wxGDIImageHandlerList::Node *node = ms_handlers.GetFirst();
+    wxGDIImageHandlerList::compatibility_iterator node = ms_handlers.GetFirst();
     while ( node )
     {
         wxGDIImageHandler *handler = node->GetData();
@@ -260,11 +263,11 @@ wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& name)
 wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& extension,
                                            long type)
 {
-    wxGDIImageHandlerList::Node *node = ms_handlers.GetFirst();
+    wxGDIImageHandlerList::compatibility_iterator node = ms_handlers.GetFirst();
     while ( node )
     {
         wxGDIImageHandler *handler = node->GetData();
-        if ( (handler->GetExtension() = extension) &&
+        if ( (handler->GetExtension() == extension) &&
              (type == -1 || handler->GetType() == type) )
         {
             return handler;
@@ -277,7 +280,7 @@ wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& extension,
 
 wxGDIImageHandler *wxGDIImage::FindHandler(long type)
 {
-    wxGDIImageHandlerList::Node *node = ms_handlers.GetFirst();
+    wxGDIImageHandlerList::compatibility_iterator node = ms_handlers.GetFirst();
     while ( node )
     {
         wxGDIImageHandler *handler = node->GetData();
@@ -292,13 +295,13 @@ wxGDIImageHandler *wxGDIImage::FindHandler(long type)
 
 void wxGDIImage::CleanUpHandlers()
 {
-    wxGDIImageHandlerList::Node *node = ms_handlers.GetFirst();
+    wxGDIImageHandlerList::compatibility_iterator node = ms_handlers.GetFirst();
     while ( node )
     {
         wxGDIImageHandler *handler = node->GetData();
-        wxGDIImageHandlerList::Node *next = node->GetNext();
+        wxGDIImageHandlerList::compatibility_iterator next = node->GetNext();
         delete handler;
-        delete node;
+        ms_handlers.Erase( node );
         node = next;
     }
 }
@@ -346,6 +349,9 @@ bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap,
     bitmap->SetHeight(bm.bmHeight);
     bitmap->SetDepth(bm.bmBitsPixel);
 
+    // use 0xc0c0c0 as transparent colour by default
+    bitmap->SetMask(new wxMask(*bitmap, *wxLIGHT_GREY));
+
     return true;
 }
 
@@ -354,21 +360,12 @@ bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap,
                                 int WXUNUSED(desiredWidth),
                                 int WXUNUSED(desiredHeight))
 {
-#if wxUSE_IMAGE_LOADING_IN_MSW
-    wxPalette *palette = NULL;
-    bool success = wxLoadIntoBitmap(WXSTRINGCAST name, bitmap, &palette) != 0;
+#if wxUSE_WXDIB
+    wxCHECK_MSG( bitmap, false, _T("NULL bitmap in LoadFile") );
 
-#if wxUSE_PALETTE
-    if ( success && palette )
-    {
-        bitmap->SetPalette(*palette);
-    }
-
-    // it was copied by the bitmap if it was loaded successfully
-    delete palette;
-#endif // wxUSE_PALETTE
+    wxDIB dib(name);
 
-    return success;
+    return dib.IsOk() && bitmap->CopyFromDIB(dib);
 #else
     return false;
 #endif
@@ -377,19 +374,14 @@ bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap,
 bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap,
                                 const wxString& name,
                                 int WXUNUSED(type),
-                                const wxPalette *pal)
+                                const wxPalette * WXUNUSED(pal))
 {
-#if wxUSE_IMAGE_LOADING_IN_MSW
+#if wxUSE_WXDIB
+    wxCHECK_MSG( bitmap, false, _T("NULL bitmap in SaveFile") );
 
-#if wxUSE_PALETTE
-    wxPalette *actualPalette = (wxPalette *)pal;
-    if ( !actualPalette )
-        actualPalette = bitmap->GetPalette();
-#else
-    wxPalette *actualPalette = NULL;
-#endif // wxUSE_PALETTE
+    wxDIB dib(*bitmap);
 
-    return wxSaveBitmap(WXSTRINGCAST name, bitmap, actualPalette) != 0;
+    return dib.Save(name);
 #else
     return false;
 #endif
@@ -404,13 +396,11 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
                                 long WXUNUSED(flags),
                                 int desiredWidth, int desiredHeight)
 {
-#if wxUSE_RESOURCE_LOADING_IN_MSW
     icon->UnRef();
 
     // actual size
     wxSize size;
 
-#ifdef __WIN32__
     HICON hicon = NULL;
 
     // Parse the filename: it may be of the form "filename;n" in order to
@@ -448,7 +438,7 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
     }
     else
 #endif
-    // were we asked for a large icon?
+        // were we asked for a large icon?
     if ( desiredWidth == ::GetSystemMetrics(SM_CXICON) &&
          desiredHeight == ::GetSystemMetrics(SM_CYICON) )
     {
@@ -475,11 +465,13 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
     }
     //else: not standard size, load below
 
+#ifndef __WXWINCE__
     if ( !hicon )
     {
         // take any size icon from the file by index
         hicon = ::ExtractIcon(wxGetInstance(), nameReal, iconIndex);
     }
+#endif
 
     if ( !hicon )
     {
@@ -490,11 +482,6 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
     }
 
     size = wxGetHiconSize(hicon);
-#else // Win16
-    HICON hicon = ReadIconFile((wxChar *)name.c_str(),
-                               wxGetInstance(),
-                               &size.x, &size.y);
-#endif // Win32/Win16
 
     if ( (desiredWidth != -1 && desiredWidth != size.x) ||
          (desiredHeight != -1 && desiredHeight != size.y) )
@@ -513,9 +500,6 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
     icon->SetSize(size.x, size.y);
 
     return icon->Ok();
-#else
-    return false;
-#endif
 }
 
 bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
@@ -537,7 +521,6 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
 
     // note that we can't just always call LoadImage() because it seems to do
     // some icon rescaling internally which results in very ugly 16x16 icons
-#if defined(__WIN32__) && !defined(__SC__)
     if ( hasSize )
     {
         hicon = (HICON)::LoadImage(wxGetInstance(), name, IMAGE_ICON,
@@ -545,12 +528,12 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
                                     LR_DEFAULTCOLOR);
     }
     else
-#endif // Win32/!Win32
     {
         hicon = ::LoadIcon(wxGetInstance(), name);
     }
 
     // next check if it's not a standard icon
+#ifndef __WXWINCE__
     if ( !hicon && !hasSize )
     {
         static const struct
@@ -573,6 +556,7 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
             }
         }
     }
+#endif
 
     wxSize size = wxGetHiconSize(hicon);
     icon->SetSize(size.x, size.y);
@@ -588,10 +572,11 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
 
 wxSize wxGetHiconSize(HICON 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));
 
-#ifdef __WIN32__
-    // Win32s doesn't have GetIconInfo function...
+#ifndef __WXWINCE__
     if ( hicon && wxGetOsVersion() != wxWIN32S )
     {
         ICONINFO info;
@@ -616,9 +601,11 @@ wxSize wxGetHiconSize(HICON hicon)
                 ::DeleteObject(info.hbmColor);
         }
     }
+#else
+    wxUnusedVar(hicon);
 #endif
-
     return size;
 }
-#endif
-    // __WXMICROWIN__
+
+#endif // __WXMICROWIN__
+