applied patch 403988 (fixing MDI window menu)

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

diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp
index 30edc93816afacb514a48342a274cc8baf3a7b34..fa2c11ffaf175c81eb77ea5c4f8f64e9e3356dc4 100644 (file)
--- a/src/msw/icon.cpp
+++ b/src/msw/icon.cpp
@@ -35,6 +35,7 @@
     #include "wx/app.h"
     #include "wx/icon.h"
     #include "wx/bitmap.h"
+    #include "wx/log.h"
 #endif
 
 #include "wx/msw/private.h"
@@ -126,7 +127,7 @@ void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
     HICON hicon = ::CreateIconIndirect(&iconInfo);
     if ( !hicon )
     {
-        wxLogLastError("CreateIconIndirect");
+        wxLogLastError(wxT("CreateIconIndirect"));
     }
     else
     {
@@ -142,7 +143,16 @@ void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
 #else // Win16
     // there are some functions in curico.cpp which probably could be used
     // here...
-    wxFAIL_MSG("not implemented");
+    // This probably doesn't work.
+    HBITMAP hBitmap = (HBITMAP) bmp.GetHBITMAP();
+    HICON hIcon = MakeIconFromBitmap((HINSTANCE) wxGetInstance(), hBitmap);
+    if (hIcon)
+    {
+        SetHICON((WXHICON)hIcon);
+        SetSize(bmp.GetWidth(), bmp.GetHeight());
+    }
+
+//    wxFAIL_MSG("Bitmap to icon conversion (including use of XPMs for icons) not implemented");
 #endif // Win32/16
 }