Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / cocoa / statbmp.h

diff --git a/include/wx/cocoa/statbmp.h b/include/wx/cocoa/statbmp.h
index c05365f2f765ed4d5f0e336a35c5d7e836c4b576..8b6874803f7b9022c62defd82370b7d7a9dbfe41 100644 (file)
--- a/include/wx/cocoa/statbmp.h
+++ b/include/wx/cocoa/statbmp.h
@@ -4,20 +4,20 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16

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

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

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_STATBMP_H__
 #define __WX_COCOA_STATBMP_H__
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_STATBMP_H__
 #define __WX_COCOA_STATBMP_H__
 

-// #include "wx/cocoa/NSxxx.h"
+DECLARE_WXCOCOA_OBJC_CLASS(NSImageView);

 
 // ========================================================================
 // wxStaticBitmap
 // ========================================================================
 
 // ========================================================================
 // wxStaticBitmap
 // ========================================================================

-class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase //, protected wxCocoaNSxxx
+class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase //, protected wxCocoaNSxxx

 {
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
     DECLARE_EVENT_TABLE()
 {
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
     DECLARE_EVENT_TABLE()


@@ -46,6 +46,9 @@ public:
 // ------------------------------------------------------------------------
 // Cocoa specifics
 // ------------------------------------------------------------------------
 // ------------------------------------------------------------------------
 // Cocoa specifics
 // ------------------------------------------------------------------------

+    WX_NSImageView GetNSImageView() { return (WX_NSImageView)m_cocoaNSView; }
+    wxBitmap m_bitmap;
+

 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------
 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------