projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add wxXLocale class and wxIsxxx_l() and wxToxxx_l() functions (heavily modified and...
[wxWidgets.git]
/
src
/
cocoa
/
statbmp.mm
diff --git
a/src/cocoa/statbmp.mm
b/src/cocoa/statbmp.mm
index 83cba15fd67d7224df27a4e9ff760f38965c6a75..3a050757c91667339988b4aa4ac708208a5d2ac3 100644
(file)
--- a/
src/cocoa/statbmp.mm
+++ b/
src/cocoa/statbmp.mm
@@
-1,24
+1,28
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// 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 licens
e
+// Licence:
wxWidgets licenc
e
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
+
+#include "wx/statbmp.h"
+
#ifndef WX_PRECOMP
#include "wx/app.h"
#ifndef WX_PRECOMP
#include "wx/app.h"
- #include "wx/statbmp.h"
#endif //WX_PRECOMP
#endif //WX_PRECOMP
+
#include "wx/cocoa/autorelease.h"
#import <AppKit/NSImageView.h>
IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
#include "wx/cocoa/autorelease.h"
#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)
BEGIN_EVENT_TABLE(wxStaticBitmap, wxControl)
END_EVENT_TABLE()
// WX_IMPLEMENT_COCOA_OWNER(wxStaticBitmap,NSTextField,NSControl,NSView)
@@
-33,9
+37,12
@@
bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID winid,
wxAutoNSAutoreleasePool pool;
if(!CreateControl(parent,winid,pos,size,style,wxDefaultValidator,name))
return false;
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];
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);
if(m_parent)
m_parent->CocoaAddChild(this);
SetInitialFrameRect(pos,size);
@@
-53,10
+60,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
wxNullB
itmap;
+ return
m_b
itmap;
}
}
-