X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/31528cd3cac75558beef4bce0ba21fd182a808ab..15f7c30516facfb272fc116aec4d3f9c3a9de085:/include/wx/motif/statbmp.h?ds=sidebyside diff --git a/include/wx/motif/statbmp.h b/include/wx/motif/statbmp.h index 63b5476cac..fe481c5f88 100644 --- a/include/wx/motif/statbmp.h +++ b/include/wx/motif/statbmp.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: statbmp.h +// Name: wx/motif/statbmp.h // Purpose: wxStaticBitmap class // Author: Julian Smart // Modified by: @@ -12,59 +12,68 @@ #ifndef _WX_STATBMP_H_ #define _WX_STATBMP_H_ -#ifdef __GNUG__ -#pragma interface "statbmp.h" -#endif - -#include "wx/control.h" - -WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr; +#include "wx/motif/bmpmotif.h" +#include "wx/icon.h" -class WXDLLEXPORT wxStaticBitmap : public wxControl +class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase { -DECLARE_DYNAMIC_CLASS(wxStaticBitmap) + DECLARE_DYNAMIC_CLASS(wxStaticBitmap) public: wxStaticBitmap() { } - ~wxStaticBitmap(); + virtual ~wxStaticBitmap(); wxStaticBitmap(wxWindow *parent, wxWindowID id, - const wxBitmap& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxStaticBitmapNameStr) + const wxBitmap& label, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxStaticBitmapNameStr) { Create(parent, id, label, pos, size, style, name); } bool Create(wxWindow *parent, wxWindowID id, - const wxBitmap& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxStaticBitmapNameStr); + const wxBitmap& label, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxStaticBitmapNameStr); virtual void SetBitmap(const wxBitmap& bitmap); virtual bool ProcessCommand(wxCommandEvent& WXUNUSED(event)) { - return FALSE; + return false; } - wxBitmap& GetBitmap() const { return (wxBitmap&) m_messageBitmap; } + wxBitmap GetBitmap() const { return m_messageBitmap; } + + // for compatibility with wxMSW + wxIcon GetIcon() const + { + // don't use wxDynamicCast, icons and bitmaps are really the same thing + return *(wxIcon*)&m_messageBitmap; + } - // overriden base class virtuals - virtual bool AcceptsFocus() const { return FALSE; } + // for compatibility with wxMSW + void SetIcon(const wxIcon& icon) + { + SetBitmap( icon ); + } // Implementation - virtual void ChangeFont(bool keepOriginalSize = TRUE); virtual void ChangeBackgroundColour(); virtual void ChangeForegroundColour(); +protected: + void DoSetBitmap(); + protected: wxBitmap m_messageBitmap; + wxBitmap m_messageBitmapOriginal; + wxBitmapCache m_bitmapCache; }; #endif - // _WX_STATBMP_H_ +// _WX_STATBMP_H_