don't hardcode wxCHOICEDLG_DIALOG_STYLE

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

diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp
index 6fa126cdd17f94a0b4d9cc5ffaae4e3172c781e0..7d04d9be55c817ce801395ab9b4325a596298d5c 100644 (file)
--- a/src/msw/gdiimage.cpp
+++ b/src/msw/gdiimage.cpp
@@ -355,22 +355,13 @@ 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
+    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;
-#else
-    return false;
-#endif
+    return dib.Save(name);
 }
 
 // ----------------------------------------------------------------------------
@@ -382,6 +373,14 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
                                 long WXUNUSED(flags),
                                 int desiredWidth, int desiredHeight)
 {
+#ifdef __DIGITALMARS__
+//FIXME __DIGITALMARS__ April 2003 CE
+    // why no ExtractIcon in library
+            wxLogTrace(_T("iconload"),
+                   _T("Returning false from wxICOFileHandler::Load because of DigitalMars compiler bug"));
+
+    return false;
+#else
     icon->UnRef();
 
     // actual size
@@ -484,6 +483,7 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
     icon->SetSize(size.x, size.y);
 
     return icon->Ok();
+#endif // Digitalmars
 }
 
 bool wxICOResourceHandler::LoadIcon(wxIcon *icon,