Merged modified 47984 from trunk:
Implement wxStaticBitmap. Copyright 2007 Software 2000 Ltd. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@47985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -12,7 +12,7 @@
|
||||
#ifndef __WX_COCOA_STATBMP_H__
|
||||
#define __WX_COCOA_STATBMP_H__
|
||||
|
||||
// #include "wx/cocoa/NSxxx.h"
|
||||
DECLARE_WXCOCOA_OBJC_CLASS(NSImageView);
|
||||
|
||||
// ========================================================================
|
||||
// wxStaticBitmap
|
||||
@@ -46,6 +46,11 @@ public:
|
||||
// ------------------------------------------------------------------------
|
||||
// Cocoa specifics
|
||||
// ------------------------------------------------------------------------
|
||||
WX_NSImageView GetNSImageView() { return (WX_NSImageView)m_cocoaNSView; }
|
||||
#if 0 // ABI incompatibility
|
||||
wxBitmap m_bitmap;
|
||||
#endif
|
||||
|
||||
// ------------------------------------------------------------------------
|
||||
// Implementation
|
||||
// ------------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user