Add wxBitmap::GetNSImage() which creates an autoreleased NSImage either

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

diff --git a/include/wx/gtk/statbmp.h b/include/wx/gtk/statbmp.h
index 4716ffd797fb45c02bbb1c4350b7080166465e3c..642e70844846235ccc6c4c14e9097f7780df00df 100644 (file)
--- a/include/wx/gtk/statbmp.h
+++ b/include/wx/gtk/statbmp.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        statbmp.h
+// Name:        wx/gtk/statbmp.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -11,39 +11,18 @@
 #ifndef __GTKSTATICBITMAPH__
 #define __GTKSTATICBITMAPH__
 
 #ifndef __GTKSTATICBITMAPH__
 #define __GTKSTATICBITMAPH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

-#include "wx/defs.h"
-
-#if wxUSE_STATBMP
-
-#include "wx/object.h"
-#include "wx/control.h"
-#include "wx/bitmap.h"

 #include "wx/icon.h"
 
 #include "wx/icon.h"
 

-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxStaticBitmap;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const char* wxStaticBitmapNameStr;
-

 //-----------------------------------------------------------------------------
 // wxStaticBitmap
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxStaticBitmap
 //-----------------------------------------------------------------------------
 

-class wxStaticBitmap: public wxControl
+class wxStaticBitmap : public wxStaticBitmapBase

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
-

 public:
     wxStaticBitmap();
     wxStaticBitmap( wxWindow *parent,
 public:
     wxStaticBitmap();
     wxStaticBitmap( wxWindow *parent,


@@ -61,13 +40,12 @@ public:
                  long style = 0,
                  const wxString& name = wxStaticBitmapNameStr);
 
                  long style = 0,
                  const wxString& name = wxStaticBitmapNameStr);
 

+    virtual void SetIcon(const wxIcon& icon) { SetBitmap( icon ); }

     virtual void SetBitmap( const wxBitmap& bitmap );
     virtual void SetBitmap( const wxBitmap& bitmap );

-
-    wxBitmap& GetBitmap() { return m_bitmap; }
-    const wxBitmap& GetBitmap() const { return m_bitmap; }
+    virtual wxBitmap GetBitmap() const { return m_bitmap; }

 
     // for compatibility with wxMSW
 
     // for compatibility with wxMSW

-    const wxIcon& GetIcon() const
+    wxIcon GetIcon() const

     {
         // don't use wxDynamicCast, icons and bitmaps are really the same thing
         // in wxGTK
     {
         // don't use wxDynamicCast, icons and bitmaps are really the same thing
         // in wxGTK


@@ -79,8 +57,8 @@ private:
     void CreatePixmapWidget();
 
     wxBitmap   m_bitmap;
     void CreatePixmapWidget();
 
     wxBitmap   m_bitmap;

-};

 
 

-#endif
+    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
+};

 
 #endif // __GTKSTATICBITMAPH__
 
 #endif // __GTKSTATICBITMAPH__