added CreateDDB() and CreatePalette()

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

diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp
index ce393c425870cb1d849b3f5051b9069ed0f4cb35..8e2ad3fb5afaea0abaa8f63fee6302cd9afbdce2 100644 (file)
--- a/src/msw/icon.cpp
+++ b/src/msw/icon.cpp
@@ -146,8 +146,7 @@ void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
     // delete the inverted mask bitmap we created as well
     ::DeleteObject(iconInfo.hbmMask);
 #else // Win16
     // delete the inverted mask bitmap we created as well
     ::DeleteObject(iconInfo.hbmMask);
 #else // Win16

-    // there are some functions in curico.cpp which probably could be used
-    // here...
+/*

     // This probably doesn't work.
     HBITMAP hBitmap = (HBITMAP) bmp.GetHBITMAP();
     HICON hIcon = MakeIconFromBitmap((HINSTANCE) wxGetInstance(), hBitmap);
     // This probably doesn't work.
     HBITMAP hBitmap = (HBITMAP) bmp.GetHBITMAP();
     HICON hIcon = MakeIconFromBitmap((HINSTANCE) wxGetInstance(), hBitmap);


@@ -156,8 +155,8 @@ void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
         SetHICON((WXHICON)hIcon);
         SetSize(bmp.GetWidth(), bmp.GetHeight());
     }
         SetHICON((WXHICON)hIcon);
         SetSize(bmp.GetWidth(), bmp.GetHeight());
     }

-
-//    wxFAIL_MSG("Bitmap to icon conversion (including use of XPMs for icons) not implemented");
+*/
+    wxFAIL_MSG("Bitmap to icon conversion (including use of XPMs for icons) not implemented");

 #endif // Win32/16
 #endif
 }
 #endif // Win32/16
 #endif
 }