X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e267406e113e2842201ca7049159c578d4988015..76e7cfab8fdb0c7862fd07e427af54181717fc62:/src/cocoa/statbmp.mm?ds=inline

diff --git a/src/cocoa/statbmp.mm b/src/cocoa/statbmp.mm
index 0be69ca515..e59b8c03a5 100644
--- a/src/cocoa/statbmp.mm
+++ b/src/cocoa/statbmp.mm
@@ -4,9 +4,8 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15
-// RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
@@ -21,8 +20,6 @@
 
 #import <AppKit/NSImageView.h>
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
-
 BEGIN_EVENT_TABLE(wxStaticBitmap, wxControl)
 END_EVENT_TABLE()
 // WX_IMPLEMENT_COCOA_OWNER(wxStaticBitmap,NSTextField,NSControl,NSView)
@@ -37,9 +34,12 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID winid,
     wxAutoNSAutoreleasePool pool;
     if(!CreateControl(parent,winid,pos,size,style,wxDefaultValidator,name))
         return false;
-    m_cocoaNSView = NULL;
     SetNSView([[NSImageView alloc] initWithFrame: MakeDefaultNSRect(size)]);
     [m_cocoaNSView release];
+
+    [GetNSImageView() setImage:bitmap.GetNSImage(true)];
+    m_bitmap = bitmap;
+
     if(m_parent)
         m_parent->CocoaAddChild(this);
     SetInitialFrameRect(pos,size);
@@ -57,9 +57,11 @@ void wxStaticBitmap::SetIcon(const wxIcon& icon)
 
 void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
 {
+    [GetNSImageView() setImage:bitmap.GetNSImage(true)];
+    m_bitmap = bitmap;
 }
 
 wxBitmap wxStaticBitmap::GetBitmap() const
 {
-    return wxNullBitmap;
+    return m_bitmap;
 }