X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7f24bd194b72c40949429b7a2dd8923208f849a1..4c3ebca927cea2742ec128c9c3ef3676d1ecae01:/include/wx/gtk1/statbmp.h diff --git a/include/wx/gtk1/statbmp.h b/include/wx/gtk1/statbmp.h index c24b212870..d11396a14a 100644 --- a/include/wx/gtk1/statbmp.h +++ b/include/wx/gtk1/statbmp.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: statbmp.h +// Name: wx/gtk/statbmp.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -11,38 +11,18 @@ #ifndef __GTKSTATICBITMAPH__ #define __GTKSTATICBITMAPH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #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 wxStaticBitmap : public wxStaticBitmapBase { - DECLARE_DYNAMIC_CLASS(wxStaticBitmap) - public: wxStaticBitmap(); wxStaticBitmap( wxWindow *parent, @@ -60,19 +40,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; + } private: + // creates the new pixmap widget + void CreatePixmapWidget(); + wxBitmap m_bitmap; -}; -#endif + DECLARE_DYNAMIC_CLASS(wxStaticBitmap) +}; #endif // __GTKSTATICBITMAPH__