Win16 cursor/icon functions are not needed any longer

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

diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp
index ea5e89cf86d7913e3d2b9cedcc610330cb70f81e..8e2ad3fb5afaea0abaa8f63fee6302cd9afbdce2 100644 (file)
--- a/src/msw/icon.cpp
+++ b/src/msw/icon.cpp
@@ -5,8 +5,8 @@
 // Modified by: 20.11.99 (VZ): don't derive from wxBitmap any more
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -49,7 +49,7 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxIconBase)
+IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxGDIObject)
 
 // ============================================================================
 // implementation
@@ -146,8 +146,7 @@ void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
     // 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);
@@ -156,8 +155,8 @@ void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
         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
 }