X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dcf924a345ea8ffbc1cf6b40b5f75c6005e504c0..a4301b8f14d21b7d28fc4f6a247b740d945ca6dc:/include/wx/gtk1/statbmp.h diff --git a/include/wx/gtk1/statbmp.h b/include/wx/gtk1/statbmp.h index 632624ce5d..0e72430522 100644 --- a/include/wx/gtk1/statbmp.h +++ b/include/wx/gtk1/statbmp.h @@ -1,65 +1,59 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: statbmp.h +// Name: wx/gtk1/statbmp.h // Purpose: // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// 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 +// wxStaticBitmap //----------------------------------------------------------------------------- -class wxStaticBitmap; +class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase +{ +public: + wxStaticBitmap(); + wxStaticBitmap( wxWindow *parent, + wxWindowID id, + const wxBitmap& label, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxStaticBitmapNameStr ); + bool Create( wxWindow *parent, + wxWindowID id, + const wxBitmap& label, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxStaticBitmapNameStr); + + virtual void SetIcon(const wxIcon& icon) { SetBitmap( icon ); } + virtual void SetBitmap( const wxBitmap& bitmap ); + virtual wxBitmap GetBitmap() const { return m_bitmap; } -//----------------------------------------------------------------------------- -// global data -//----------------------------------------------------------------------------- + // for compatibility with wxMSW + wxIcon GetIcon() const + { + // don't use wxDynamicCast, icons and bitmaps are really the same thing + // in wxGTK + return (const wxIcon &)m_bitmap; + } -extern const char* wxStaticBitmapNameStr; + static wxVisualAttributes + GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); -//----------------------------------------------------------------------------- -// wxStaticBitmap -//----------------------------------------------------------------------------- +private: + wxBitmap m_bitmap; -class wxStaticBitmap: public wxControl -{ - DECLARE_DYNAMIC_CLASS(wxStaticBitmap) - - public: - - wxStaticBitmap(void); - wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap& label, - const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = 0, const wxString& name = wxStaticBitmapNameStr ); - bool Create( wxWindow *parent, wxWindowID id, const wxBitmap& label, - const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = 0, const wxString& name = wxStaticBitmapNameStr); - virtual void SetBitmap( const wxBitmap& bitmap ); - wxBitmap& GetBitmap(void) const { return (wxBitmap&)m_bitmap; } - - private: - - wxBitmap m_bitmap; + DECLARE_DYNAMIC_CLASS(wxStaticBitmap) }; -#endif - #endif // __GTKSTATICBITMAPH__