X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/32d4bfd16c554ba060ccee9236abb8e7ff0e913a..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/gtk/statbmp.h?ds=inline diff --git a/include/wx/gtk/statbmp.h b/include/wx/gtk/statbmp.h index 4716ffd797..b7bba950d0 100644 --- a/include/wx/gtk/statbmp.h +++ b/include/wx/gtk/statbmp.h @@ -1,49 +1,22 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: statbmp.h +// Name: wx/gtk/statbmp.h // Purpose: // Author: Robert Roebling -// Id: $Id$ // Copyright: (c) 1998 Robert Roebling // 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" #include "wx/icon.h" -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class wxStaticBitmap; - -//----------------------------------------------------------------------------- -// global data -//----------------------------------------------------------------------------- - -extern const char* wxStaticBitmapNameStr; - //----------------------------------------------------------------------------- // wxStaticBitmap //----------------------------------------------------------------------------- -class wxStaticBitmap: public wxControl +class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase { - DECLARE_DYNAMIC_CLASS(wxStaticBitmap) - public: wxStaticBitmap(); wxStaticBitmap( wxWindow *parent, @@ -61,26 +34,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 - const wxIcon& GetIcon() const + 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(); + static wxVisualAttributes + GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); +private: wxBitmap m_bitmap; -}; -#endif + DECLARE_DYNAMIC_CLASS(wxStaticBitmap) +}; #endif // __GTKSTATICBITMAPH__