const wxValidator& wxVALIDATOR_PARAM(validator),
const wxString& name)
{
- m_bmpNormal = bitmap;
+ SetBitmapLabel(bitmap);
SetName(name);
#if wxUSE_VALIDATORS
SubclassWin(m_hWnd);
SetPosition(pos);
- SetBestSize(size);
+ SetInitialSize(size);
return true;
}
event.Skip();
}
-void wxBitmapButton::OnSetBitmap()
+void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
+{
+#if wxUSE_IMAGE
+ if ( !HasFlag(wxBU_AUTODRAW) && !m_disabledSetByUser && bitmap.IsOk() )
+ {
+ m_bmpDisabled = wxBitmap(bitmap.ConvertToImage().ConvertToGreyscale());
+ }
+#endif // wxUSE_IMAGE
+
+ wxBitmapButtonBase::SetBitmapLabel(bitmap);
+}
+
+void wxBitmapButton::SetBitmapFocus(const wxBitmap& focus)
{
// if the focus bitmap is specified but hover one isn't, use the focus
// bitmap for hovering as well if this is consistent with the current
// rationale: this is compatible with the old wxGTK behaviour and also
// makes it much easier to do "the right thing" for all platforms (some of
// them, such as Windows XP, have "hot" buttons while others don't)
- if ( !m_bmpHover.Ok() &&
- m_bmpFocus.Ok() &&
- wxUxThemeEngine::GetIfActive() )
- {
+ if ( focus.Ok() && !m_hoverSetByUser )
m_bmpHover = m_bmpFocus;
- }
- // this will redraw us
- wxBitmapButtonBase::OnSetBitmap();
+ wxBitmapButtonBase::SetBitmapFocus(focus);
+}
+
+void wxBitmapButton::SetBitmapDisabled(const wxBitmap& disabled)
+{
+ if ( disabled.IsOk() )
+ m_disabledSetByUser = true;
+
+ wxBitmapButtonBase::SetBitmapDisabled(disabled);
+}
+
+void wxBitmapButton::SetBitmapHover(const wxBitmap& hover)
+{
+ if ( hover.IsOk() )
+ m_hoverSetByUser = true;
+
+ wxBitmapButtonBase::SetBitmapHover(hover);
}
#if wxUSE_UXTHEME
::PatBlt( (HDC) dc, left, top, right, bottom, PATTERNPAINT);
}
-void wxBitmapButton::SetDefault()
-{
- wxButton::SetDefault();
-}
-
wxSize wxBitmapButton::DoGetBestSize() const
{
if ( m_bmpNormal.Ok() )