menu bar wasn't set properly internally after my previous change - fixed

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

diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp
index 30edc93816afacb514a48342a274cc8baf3a7b34..8f27b61324cc5c1ff31636b0591e08296c2a4a04 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/app.h"
     #include "wx/icon.h"
     #include "wx/bitmap.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/msw/private.h"
 #endif
 
 #include "wx/msw/private.h"


@@ -62,7 +63,9 @@ void wxIconRefData::Free()
 {
     if ( m_hIcon )
     {
 {
     if ( m_hIcon )
     {

+#ifndef __WXMICROWIN__

         ::DestroyIcon((HICON) m_hIcon);
         ::DestroyIcon((HICON) m_hIcon);

+#endif

 
         m_hIcon = 0;
     }
 
         m_hIcon = 0;
     }


@@ -93,6 +96,7 @@ wxIcon::~wxIcon()
 
 void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
 {
 
 void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
 {

+#ifndef __WXMICROWIN__

 #ifdef __WIN32__
     wxMask *mask = bmp.GetMask();
     if ( !mask )
 #ifdef __WIN32__
     wxMask *mask = bmp.GetMask();
     if ( !mask )


@@ -126,7 +130,7 @@ void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
     HICON hicon = ::CreateIconIndirect(&iconInfo);
     if ( !hicon )
     {
     HICON hicon = ::CreateIconIndirect(&iconInfo);
     if ( !hicon )
     {

-        wxLogLastError("CreateIconIndirect");
+        wxLogLastError(wxT("CreateIconIndirect"));

     }
     else
     {
     }
     else
     {


@@ -142,8 +146,18 @@ void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
 #else // Win16
     // there are some functions in curico.cpp which probably could be used
     // here...
 #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
 #endif // Win32/16

+#endif

 }
 
 void wxIcon::CreateIconFromXpm(const char **data)
 }
 
 void wxIcon::CreateIconFromXpm(const char **data)