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 df5866edcf288fce40a2cfae58f89d8bba110a8f..8b6874803f7b9022c62defd82370b7d7a9dbfe41 100644 (file)
--- a/include/wx/cocoa/statbmp.h
+++ b/include/wx/cocoa/statbmp.h
@@ -12,12 +12,12 @@
 #ifndef __WX_COCOA_STATBMP_H__
 #define __WX_COCOA_STATBMP_H__
 
-// #include "wx/cocoa/NSxxx.h"
+DECLARE_WXCOCOA_OBJC_CLASS(NSImageView);
 
 // ========================================================================
 // wxStaticBitmap
 // ========================================================================
-class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase //, protected wxCocoaNSxxx
+class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase //, protected wxCocoaNSxxx
 {
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
     DECLARE_EVENT_TABLE()
@@ -46,6 +46,9 @@ public:
 // ------------------------------------------------------------------------
 // Cocoa specifics
 // ------------------------------------------------------------------------
+    WX_NSImageView GetNSImageView() { return (WX_NSImageView)m_cocoaNSView; }
+    wxBitmap m_bitmap;
+
 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------