#include "wx/bitmap.h"
#include "wx/button.h"
-WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxButtonNameStr;
// ----------------------------------------------------------------------------
// wxBitmapButton: a button which shows bitmaps instead of the usual string.
{
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)
{ m_bmpFocus = focus; OnSetBitmap(); };
void SetBitmapDisabled(const wxBitmap& disabled)
{ m_bmpDisabled = disabled; OnSetBitmap(); };
- void SetLabel(const wxBitmap& bitmap)
- { SetBitmapLabel(bitmap); }
+ 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 bool CanApplyParentThemeBackground() const { return true; }
+ // 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() { }
+ 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__)