Remove my binary compatibility stuff from HEAD. Patch #1367014 used for reference.

[wxWidgets.git] / src / cocoa / statbmp.mm

diff --git a/src/cocoa/statbmp.mm b/src/cocoa/statbmp.mm
index f3de0e6478417b565e2884eeb08af562160c8559..10c5ec1ebeccf2833b9d62c3acff83a53dfbaed6 100644 (file)
--- a/src/cocoa/statbmp.mm
+++ b/src/cocoa/statbmp.mm
@@ -6,7 +6,7 @@
 // Created:     2003/02/15
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/02/15
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWindows license
+// Licence:    wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"


@@ -14,8 +14,9 @@
     #include "wx/app.h"
     #include "wx/statbmp.h"
 #endif //WX_PRECOMP
     #include "wx/app.h"
     #include "wx/statbmp.h"
 #endif //WX_PRECOMP

+#include "wx/cocoa/autorelease.h"

 
 

-#import <AppKit/NSView.h>
+#import <AppKit/NSImageView.h>

 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
 BEGIN_EVENT_TABLE(wxStaticBitmap, wxControl)
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
 BEGIN_EVENT_TABLE(wxStaticBitmap, wxControl)


@@ -29,10 +30,11 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID winid,
            long style,
            const wxString& name)
 {
            long style,
            const wxString& name)
 {

+    wxAutoNSAutoreleasePool pool;

     if(!CreateControl(parent,winid,pos,size,style,wxDefaultValidator,name))
         return false;
     m_cocoaNSView = NULL;
     if(!CreateControl(parent,winid,pos,size,style,wxDefaultValidator,name))
         return false;
     m_cocoaNSView = NULL;

-    SetNSView([[NSView alloc] initWithFrame: MakeDefaultNSRect(size)]);
+    SetNSView([[NSImageView alloc] initWithFrame: MakeDefaultNSRect(size)]);

     [m_cocoaNSView release];
     if(m_parent)
         m_parent->CocoaAddChild(this);
     [m_cocoaNSView release];
     if(m_parent)
         m_parent->CocoaAddChild(this);