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 2bf6f0bce07ebdfd1b17e555930c8edc1afff53f..f2e84134d0765c6496c2d0d934a720810379e4c4 100644 (file)
--- a/src/msw/gdiimage.cpp
+++ b/src/msw/gdiimage.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "gdiimage.h"
 #endif
 
@@ -39,7 +39,17 @@
 
 #include "wx/bitmap.h"
 #include "wx/msw/gdiimage.h"
+
+#if wxUSE_WXDIB
 #include "wx/msw/dib.h"
+#endif
+
+#ifdef __WXWINCE__
+#include <winreg.h>
+#include <shellapi.h>
+#endif
+
+#include "wx/file.h"
 
 #include "wx/listimpl.cpp"
 WX_DEFINE_LIST(wxGDIImageHandlerList);
@@ -141,6 +151,7 @@ public:
     {
     }
 
+protected:
     virtual bool LoadIcon(wxIcon *icon,
                           const wxString& name, long flags,
                           int desiredWidth = -1, int desiredHeight = -1);
@@ -158,6 +169,7 @@ public:
     {
     }
 
+protected:
     virtual bool LoadIcon(wxIcon *icon,
                           const wxString& name, long flags,
                           int desiredWidth = -1, int desiredHeight = -1);
@@ -255,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;
@@ -337,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;
 }
 
@@ -345,11 +360,15 @@ bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap,
                                 int WXUNUSED(desiredWidth),
                                 int WXUNUSED(desiredHeight))
 {
+#if wxUSE_WXDIB
     wxCHECK_MSG( bitmap, false, _T("NULL bitmap in LoadFile") );
 
     wxDIB dib(name);
 
     return dib.IsOk() && bitmap->CopyFromDIB(dib);
+#else
+    return false;
+#endif
 }
 
 bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap,
@@ -357,11 +376,15 @@ bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap,
                                 int WXUNUSED(type),
                                 const wxPalette * WXUNUSED(pal))
 {
+#if wxUSE_WXDIB
     wxCHECK_MSG( bitmap, false, _T("NULL bitmap in SaveFile") );
 
     wxDIB dib(*bitmap);
 
     return dib.Save(name);
+#else
+    return false;
+#endif
 }
 
 // ----------------------------------------------------------------------------
@@ -415,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) )
     {
@@ -442,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 )
     {
@@ -508,6 +533,7 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
     }
 
     // next check if it's not a standard icon
+#ifndef __WXWINCE__
     if ( !hicon && !hasSize )
     {
         static const struct
@@ -530,6 +556,7 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
             }
         }
     }
+#endif
 
     wxSize size = wxGetHiconSize(hicon);
     icon->SetSize(size.x, size.y);
@@ -545,8 +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));
 
+#ifndef __WXWINCE__
     if ( hicon && wxGetOsVersion() != wxWIN32S )
     {
         ICONINFO info;
@@ -571,7 +601,9 @@ wxSize wxGetHiconSize(HICON hicon)
                 ::DeleteObject(info.hbmColor);
         }
     }
-
+#else
+    wxUnusedVar(hicon);
+#endif
     return size;
 }