moved AppendAppName() from MSW to common code; modified it to not double the trailing...

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

diff --git a/src/cocoa/statbmp.mm b/src/cocoa/statbmp.mm
index de08f55c6ac2807c5d18a2f4e002c3457af61655..10c5ec1ebeccf2833b9d62c3acff83a53dfbaed6 100644 (file)
--- a/src/cocoa/statbmp.mm
+++ b/src/cocoa/statbmp.mm
@@ -6,11 +6,17 @@
 // 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/app.h"
-#include "wx/statbmp.h"
+#include "wx/wxprec.h"
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/statbmp.h"
+#endif //WX_PRECOMP
+#include "wx/cocoa/autorelease.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)


@@ -24,17 +30,21 @@ 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([[NSImageView alloc] initWithFrame: MakeDefaultNSRect(size)]);
+    [m_cocoaNSView release];

     if(m_parent)
         m_parent->CocoaAddChild(this);
     if(m_parent)
         m_parent->CocoaAddChild(this);

+    SetInitialFrameRect(pos,size);
+

     return true;
 }
 
 wxStaticBitmap::~wxStaticBitmap()
 {
     return true;
 }
 
 wxStaticBitmap::~wxStaticBitmap()
 {

-    CocoaRemoveFromParent();

 }
 
 void wxStaticBitmap::SetIcon(const wxIcon& icon)
 }
 
 void wxStaticBitmap::SetIcon(const wxIcon& icon)