- m_messageBitmap = bitmap;
- SetName(name);
- if (parent) parent->AddChild(this);
-
- m_backgroundColour = parent->GetBackgroundColour() ;
- m_foregroundColour = parent->GetForegroundColour() ;
-
- if ( id == -1 )
- m_windowId = (int)NewControlId();
- else
- m_windowId = id;
-
- int x = pos.x;
- int y = pos.y;
- int width = size.x;
- int height = size.y;
-
- if ( width < 0 && bitmap.Ok() )
- width = bitmap.GetWidth();
- if ( height < 0 && bitmap.Ok() )
- height = bitmap.GetHeight();
-
- m_windowStyle = style;
-
- // Use an ownerdraw button to produce a static bitmap, since there's
- // no ownerdraw static.
- // TODO: perhaps this should be a static item, with style SS_BITMAP.
- m_hWnd = (WXHWND)CreateWindow
- (
- "BUTTON",
- "",
- BS_OWNERDRAW | WS_TABSTOP | WS_CHILD | WS_VISIBLE,
- 0, 0, 0, 0,
- (HWND)parent->GetHWND(),
- (HMENU)m_windowId,
- wxGetInstance(),
- NULL
- );
-
- // Subclass again for purposes of dialog editing mode
- SubclassWin(m_hWnd);
-
- SetFont(* GetParent()->GetFont());
-
- SetSize(x, y, width, height);
- return TRUE;
+ bool isIcon = bitmap.IsKindOf( CLASSINFO(wxIcon) );
+
+ if( !isIcon )
+ {
+ wxASSERT_MSG( wxDynamicCast(&bitmap, wxBitmap),
+ wxT("not an icon and not a bitmap?") );
+
+ const wxBitmap& bmp = (const wxBitmap&)bitmap;
+ wxMask *mask = bmp.GetMask();
+ if ( mask && mask->GetMaskBitmap() )
+ {
+ wxIcon* icon = new wxIcon;
+ icon->CopyFromBitmap(bmp);
+
+ return icon;
+ }
+
+ return new wxBitmap( bmp );
+ }
+
+ // copying a bitmap is a cheap operation
+ return new wxIcon( (const wxIcon&)bitmap );