X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aae91497f6ac36a76d3313cf405cae0f098ea1d1..33f3e2b31ed781ba1446b49ec6d3e226c0a5c652:/include/wx/motif/statbmp.h?ds=sidebyside diff --git a/include/wx/motif/statbmp.h b/include/wx/motif/statbmp.h index 004edc60af..11d8fbb9b7 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,23 +12,17 @@ #ifndef _WX_STATBMP_H_ #define _WX_STATBMP_H_ -#ifdef __GNUG__ -#pragma interface "statbmp.h" -#endif - #include "wx/motif/bmpmotif.h" #include "wx/icon.h" -WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr; - -class WXDLLEXPORT wxStaticBitmap : public wxControl +class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase { DECLARE_DYNAMIC_CLASS(wxStaticBitmap) - + public: wxStaticBitmap() { } - ~wxStaticBitmap(); - + virtual ~wxStaticBitmap(); + wxStaticBitmap(wxWindow *parent, wxWindowID id, const wxBitmap& label, const wxPoint& pos = wxDefaultPosition, @@ -38,44 +32,40 @@ public: { 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); - + 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 - const wxIcon& GetIcon() const + wxIcon GetIcon() const { // don't use wxDynamicCast, icons and bitmaps are really the same thing - return (const wxIcon &)m_messageBitmap; + return *(wxIcon*)&m_messageBitmap; } - + // for compatibility with wxMSW void SetIcon(const wxIcon& icon) { SetBitmap( icon ); } - - // overriden base class virtuals - virtual bool AcceptsFocus() const { return FALSE; } - + // Implementation - virtual void ChangeFont(bool keepOriginalSize = TRUE); virtual void ChangeBackgroundColour(); virtual void ChangeForegroundColour(); - + protected: void DoSetBitmap();