Remove unnecessary base class OnPaint() call from wxGenericColourDialog.

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

diff --git a/src/cocoa/statbmp.mm b/src/cocoa/statbmp.mm
index de08f55c6ac2807c5d18a2f4e002c3457af61655..538c999181ea8f86946560c2f757dd30984339ce 100644 (file)
--- a/src/cocoa/statbmp.mm
+++ b/src/cocoa/statbmp.mm
@@ -1,18 +1,26 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cocoa/statbmp.mm
+// Name:        src/cocoa/statbmp.mm

 // Purpose:     wxStaticBitmap
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15
 // Purpose:     wxStaticBitmap
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) 2003 David Elliott
 // Copyright:   (c) 2003 David Elliott

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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/app.h"
+#include "wx/wxprec.h"
+

 #include "wx/statbmp.h"
 
 #include "wx/statbmp.h"
 

-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif //WX_PRECOMP
+
+#include "wx/cocoa/autorelease.h"
+
+#import <AppKit/NSImageView.h>
+

 BEGIN_EVENT_TABLE(wxStaticBitmap, wxControl)
 END_EVENT_TABLE()
 // WX_IMPLEMENT_COCOA_OWNER(wxStaticBitmap,NSTextField,NSControl,NSView)
 BEGIN_EVENT_TABLE(wxStaticBitmap, wxControl)
 END_EVENT_TABLE()
 // WX_IMPLEMENT_COCOA_OWNER(wxStaticBitmap,NSTextField,NSControl,NSView)


@@ -24,17 +32,24 @@ 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;
     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);
     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)


@@ -43,10 +58,11 @@ void wxStaticBitmap::SetIcon(const wxIcon& icon)
 
 void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
 {
 
 void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
 {

+    [GetNSImageView() setImage:bitmap.GetNSImage(true)];
+    m_bitmap = bitmap;

 }
 
 wxBitmap wxStaticBitmap::GetBitmap() const
 {
 }
 
 wxBitmap wxStaticBitmap::GetBitmap() const
 {

-    return wxNullBitmap;
+    return m_bitmap;

 }
 }

-