X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/16cba29d3a5a0a95b367382311a4a7a9a9833210..1cf57808cb146742378d24faa77b9e9482c86b2b:/include/wx/bmpbuttn.h diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h index 1bc0a1239b..990f3f3842 100644 --- a/include/wx/bmpbuttn.h +++ b/include/wx/bmpbuttn.h @@ -19,7 +19,7 @@ #include "wx/bitmap.h" #include "wx/button.h" -extern WXDLLEXPORT_DATA(const wxChar*) wxButtonNameStr; +extern WXDLLEXPORT_DATA(const char) wxButtonNameStr[]; // ---------------------------------------------------------------------------- // wxBitmapButton: a button which shows bitmaps instead of the usual string. @@ -30,71 +30,85 @@ class WXDLLEXPORT wxBitmapButtonBase : public wxButton { public: wxBitmapButtonBase() - : m_bmpNormal(), m_bmpSelected(), m_bmpFocus(), m_bmpDisabled() - , m_marginX(0), m_marginY(0) - { } + { + m_marginX = + m_marginY = 0; + } // set the bitmaps - void SetBitmapLabel(const wxBitmap& bitmap) + virtual void SetBitmapLabel(const wxBitmap& bitmap) { m_bmpNormal = bitmap; OnSetBitmap(); } - void SetBitmapSelected(const wxBitmap& sel) - { m_bmpSelected = sel; OnSetBitmap(); }; - void SetBitmapFocus(const wxBitmap& focus) - { m_bmpFocus = focus; OnSetBitmap(); }; - void SetBitmapDisabled(const wxBitmap& disabled) - { m_bmpDisabled = disabled; OnSetBitmap(); }; - void SetLabel(const wxBitmap& bitmap) - { SetBitmapLabel(bitmap); } + virtual void SetBitmapSelected(const wxBitmap& sel) + { m_bmpSelected = sel; OnSetBitmap(); } + virtual void SetBitmapFocus(const wxBitmap& focus) + { m_bmpFocus = focus; OnSetBitmap(); } + virtual void SetBitmapDisabled(const wxBitmap& disabled) + { m_bmpDisabled = disabled; OnSetBitmap(); } + virtual void SetBitmapHover(const wxBitmap& hover) + { m_bmpHover = hover; OnSetBitmap(); } // retrieve the bitmaps const wxBitmap& GetBitmapLabel() const { return m_bmpNormal; } const wxBitmap& GetBitmapSelected() const { return m_bmpSelected; } const wxBitmap& GetBitmapFocus() const { return m_bmpFocus; } const wxBitmap& GetBitmapDisabled() const { return m_bmpDisabled; } + const wxBitmap& GetBitmapHover() const { return m_bmpHover; } wxBitmap& GetBitmapLabel() { return m_bmpNormal; } wxBitmap& GetBitmapSelected() { return m_bmpSelected; } wxBitmap& GetBitmapFocus() { return m_bmpFocus; } wxBitmap& GetBitmapDisabled() { return m_bmpDisabled; } + wxBitmap& GetBitmapHover() { return m_bmpHover; } // set/get the margins around the button virtual void SetMargins(int x, int y) { m_marginX = x; m_marginY = y; } int GetMarginX() const { return m_marginX; } int GetMarginY() const { return m_marginY; } - virtual void ApplyParentThemeBackground(const wxColour& bg) - { SetBackgroundColour(bg); } + // deprecated synonym for SetBitmapLabel() +#if WXWIN_COMPATIBILITY_2_6 + wxDEPRECATED( void SetLabel(const wxBitmap& bitmap) ); + // prevent virtual function hiding + virtual void SetLabel(const wxString& label) + { wxWindow::SetLabel(label); } +#endif // WXWIN_COMPATIBILITY_2_6 protected: // function called when any of the bitmaps changes - virtual void OnSetBitmap() { InvalidateBestSize(); } + virtual void OnSetBitmap() { InvalidateBestSize(); Refresh(); } // the bitmaps for various states wxBitmap m_bmpNormal, m_bmpSelected, m_bmpFocus, - m_bmpDisabled; + m_bmpDisabled, + m_bmpHover; // the margins around the bitmap int m_marginX, m_marginY; -private: - // Prevent Virtual function hiding warnings - void SetLabel(const wxString& rsLabel) - { wxWindowBase::SetLabel(rsLabel); } DECLARE_NO_COPY_CLASS(wxBitmapButtonBase) }; +#if WXWIN_COMPATIBILITY_2_6 +inline void wxBitmapButtonBase::SetLabel(const wxBitmap& bitmap) +{ + SetBitmapLabel(bitmap); +} +#endif // WXWIN_COMPATIBILITY_2_6 + #if defined(__WXUNIVERSAL__) #include "wx/univ/bmpbuttn.h" #elif defined(__WXMSW__) #include "wx/msw/bmpbuttn.h" #elif defined(__WXMOTIF__) #include "wx/motif/bmpbuttn.h" -#elif defined(__WXGTK__) +#elif defined(__WXGTK20__) #include "wx/gtk/bmpbuttn.h" +#elif defined(__WXGTK__) + #include "wx/gtk1/bmpbuttn.h" #elif defined(__WXMAC__) #include "wx/mac/bmpbuttn.h" #elif defined(__WXCOCOA__)