X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a8c80eb1427f3baae78d682af29ee3ad0b57d607..3684ade82ec6f5fb7ff72341e26060b6ea0793c8:/src/cocoa/statbmp.mm

diff --git a/src/cocoa/statbmp.mm b/src/cocoa/statbmp.mm
index f94ea97da2..050ab2e041 100644
--- a/src/cocoa/statbmp.mm
+++ b/src/cocoa/statbmp.mm
@@ -9,10 +9,13 @@
 // Licence:   	wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#include "wx/app.h"
-#include "wx/statbmp.h"
+#include "wx/wxprec.h"
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/statbmp.h"
+#endif //WX_PRECOMP
 
-#import <AppKit/NSView.h>
+#import <AppKit/NSImageView.h>
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
 BEGIN_EVENT_TABLE(wxStaticBitmap, wxControl)
@@ -29,17 +32,17 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID winid,
     if(!CreateControl(parent,winid,pos,size,style,wxDefaultValidator,name))
         return false;
     m_cocoaNSView = NULL;
-    SetNSView([[NSView alloc] initWithFrame: NSMakeRect(10,10,20,20)]);
+    SetNSView([[NSImageView alloc] initWithFrame: MakeDefaultNSRect(size)]);
     [m_cocoaNSView release];
     if(m_parent)
         m_parent->CocoaAddChild(this);
+    SetInitialFrameRect(pos,size);
+
     return true;
 }
 
 wxStaticBitmap::~wxStaticBitmap()
 {
-    CocoaRemoveFromParent();
-    SetNSView(NULL);
 }
 
 void wxStaticBitmap::SetIcon(const wxIcon& icon)