X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/32d4bfd16c554ba060ccee9236abb8e7ff0e913a..5836c9080be6e3748580755dc9bd371e17e1018c:/include/wx/gtk/statbmp.h diff --git a/include/wx/gtk/statbmp.h b/include/wx/gtk/statbmp.h index 4716ffd797..8490ad78a4 100644 --- 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$ @@ -15,35 +15,14 @@ #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" -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class wxStaticBitmap; - -//----------------------------------------------------------------------------- -// global data -//----------------------------------------------------------------------------- - -extern const char* wxStaticBitmapNameStr; - //----------------------------------------------------------------------------- // wxStaticBitmap //----------------------------------------------------------------------------- -class wxStaticBitmap: public wxControl +class wxStaticBitmap : public wxStaticBitmapBase { - DECLARE_DYNAMIC_CLASS(wxStaticBitmap) - public: wxStaticBitmap(); wxStaticBitmap( wxWindow *parent, @@ -61,13 +40,12 @@ 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 - const wxIcon& GetIcon() const + wxIcon GetIcon() const { // don't use wxDynamicCast, icons and bitmaps are really the same thing // in wxGTK @@ -79,8 +57,8 @@ private: void CreatePixmapWidget(); wxBitmap m_bitmap; -}; -#endif + DECLARE_DYNAMIC_CLASS(wxStaticBitmap) +}; #endif // __GTKSTATICBITMAPH__