Ryan's cumulative wxActiveX and media control patch (1427775)

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

diff --git a/include/wx/gtk1/statbmp.h b/include/wx/gtk1/statbmp.h
index c24b2128705a0dbba740a6432fa782fbf53028d2..0e7243052258f086365045fa49ffc1d486dd2d0b 100644 (file)
--- a/include/wx/gtk1/statbmp.h
+++ b/include/wx/gtk1/statbmp.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        statbmp.h
+// Name:        wx/gtk1/statbmp.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -7,42 +7,17 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKSTATICBITMAPH__
 #define __GTKSTATICBITMAPH__
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "wx/defs.h"
-
-#if wxUSE_STATBMP
-
-#include "wx/object.h"
-#include "wx/control.h"
-#include "wx/bitmap.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxStaticBitmap;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const char* wxStaticBitmapNameStr;
+#include "wx/icon.h"
 
 //-----------------------------------------------------------------------------
 // wxStaticBitmap
 //-----------------------------------------------------------------------------
 
-class wxStaticBitmap: public wxControl
+class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase
 {
-    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
-
 public:
     wxStaticBitmap();
     wxStaticBitmap( wxWindow *parent,
@@ -60,19 +35,25 @@ public:
                  long style = 0,
                  const wxString& name = wxStaticBitmapNameStr);
 
+    virtual void SetIcon(const wxIcon& icon) { SetBitmap( icon ); }
     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
-    wxIcon& GetIcon()
-        { return *(wxDynamicCast(&m_bitmap, wxIcon)); }
+    wxIcon GetIcon() const
+    {
+        // don't use wxDynamicCast, icons and bitmaps are really the same thing
+        // in wxGTK
+        return (const wxIcon &)m_bitmap;
+    }
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
 private:
     wxBitmap   m_bitmap;
-};
 
-#endif
+    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
+};
 
 #endif // __GTKSTATICBITMAPH__