added debug/release DLL configurations so that VC++ chooses the right one when buildi...

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

diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp
index 9ac518a0657c7618ea177fc99a12fc8c6b4a60db..99ffb48afc8467d7148890d12583c1c98d2b00c7 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
 
@@ -49,6 +49,8 @@
 #include <shellapi.h>
 #endif
 
+#include "wx/file.h"
+
 #include "wx/listimpl.cpp"
 WX_DEFINE_LIST(wxGDIImageHandlerList);
 
@@ -345,6 +347,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;
 }
 
@@ -360,7 +365,7 @@ bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap,
 
     return dib.IsOk() && bitmap->CopyFromDIB(dib);
 #else
-    return FALSE;
+    return false;
 #endif
 }
 
@@ -376,7 +381,7 @@ bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap,
 
     return dib.Save(name);
 #else
-    return FALSE;
+    return false;
 #endif
 }
 
@@ -565,7 +570,10 @@ 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 )
     {
@@ -591,6 +599,8 @@ wxSize wxGetHiconSize(HICON hicon)
                 ::DeleteObject(info.hbmColor);
         }
     }
+#else
+    wxUnusedVar(hicon);
 #endif
     return size;
 }