X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ea9868e8d269fa4a72b6af725b048a7eb4fb8728..ce4b7808ca940be201422a066de141ca12f13863:/include/wx/motif/bmpbuttn.h diff --git a/include/wx/motif/bmpbuttn.h b/include/wx/motif/bmpbuttn.h index 8ce933170d..68215c9537 100644 --- a/include/wx/motif/bmpbuttn.h +++ b/include/wx/motif/bmpbuttn.h @@ -1,22 +1,18 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: bmpbuttn.h +// Name: wx/motif/bmpbuttn.h // Purpose: wxBitmapButton class // Author: Julian Smart // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_BMPBUTTN_H_ #define _WX_BMPBUTTN_H_ -#ifdef __GNUG__ -#pragma interface "bmpbuttn.h" -#endif - -WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr; +#include "wx/motif/bmpmotif.h" #define wxDEFAULT_BUTTON_MARGIN 4 @@ -25,7 +21,7 @@ class WXDLLEXPORT wxBitmapButton: public wxBitmapButtonBase DECLARE_DYNAMIC_CLASS(wxBitmapButton) public: wxBitmapButton(); - ~wxBitmapButton(); + virtual ~wxBitmapButton(); wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW, @@ -34,13 +30,13 @@ public: { Create(parent, id, bitmap, pos, size, style, validator, name); } - + bool Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr); - + virtual void SetLabel(const wxBitmap& bitmap) { SetBitmapLabel(bitmap); @@ -49,25 +45,27 @@ public: { wxControl::SetLabel(label); } - + virtual void SetBitmapLabel(const wxBitmap& bitmap); - + void SetBitmapSelected(const wxBitmap& sel); void SetBitmapFocus(const wxBitmap& focus); void SetBitmapDisabled(const wxBitmap& disabled); - + // Implementation void DoSetBitmap(); virtual void ChangeBackgroundColour(); virtual wxSize DoGetBestSize() const; - + protected: wxBitmap m_bmpNormalOriginal; // May be different from m_buttonBitmap // if m_buttonBitmap has been changed // to reflect button background colour - wxBitmap m_bmpSelectedOriginal; + wxBitmap m_bmpSelectedOriginal; wxBitmap m_bmpDisabledOriginal; - + + wxBitmapCache m_bitmapCache; + WXPixmap m_insensPixmap; };