X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a4294b7832a5aed3c1cccc06aecd227d43da8830..cf1a9b45c7b70f217d3cc282ab77df8feaadcdeb:/include/wx/motif/bmpbuttn.h?ds=inline diff --git a/include/wx/motif/bmpbuttn.h b/include/wx/motif/bmpbuttn.h index bb5ea2f503..47fe63c018 100644 --- a/include/wx/motif/bmpbuttn.h +++ b/include/wx/motif/bmpbuttn.h @@ -47,6 +47,10 @@ class WXDLLEXPORT wxBitmapButton: public wxButton { SetBitmapLabel(bitmap); } + virtual void SetLabel(const wxString& label) + { + wxControl::SetLabel(label); + } virtual void SetBitmapLabel(const wxBitmap& bitmap); @@ -63,11 +67,21 @@ class WXDLLEXPORT wxBitmapButton: public wxButton inline int GetMarginX() { return m_marginX; } inline int GetMarginY() { return m_marginY; } +// Implementation + void DoSetBitmap(); + virtual void ChangeBackgroundColour(); + protected: + wxBitmap m_buttonBitmapFocus; wxBitmap m_buttonBitmap; + wxBitmap m_buttonBitmapOriginal; // May be different from m_buttonBitmap + // if m_buttonBitmap has been changed + // to reflect button background colour wxBitmap m_buttonBitmapSelected; - wxBitmap m_buttonBitmapFocus; + wxBitmap m_buttonBitmapSelectedOriginal; + wxBitmap m_buttonBitmapDisabled; + wxBitmap m_buttonBitmapDisabledOriginal; int m_marginX; int m_marginY;