BEGIN_EVENT_TABLE(wxBitmapButton, wxBitmapButtonBase)
EVT_SYS_COLOUR_CHANGED(wxBitmapButton::OnSysColourChanged)
- EVT_ENTER_WINDOW(wxBitmapButton::OnMouseEnterOrLeave)
- EVT_LEAVE_WINDOW(wxBitmapButton::OnMouseEnterOrLeave)
END_EVENT_TABLE()
/*
const wxValidator& wxVALIDATOR_PARAM(validator),
const wxString& name)
{
- if ( !CreateControl(parent, id, pos, size, style, validator, name) )
+ if ( !wxBitmapButtonBase::Create(parent, id, "",
+ pos, size, style, validator, name) )
return false;
SetBitmapLabel(bitmap);
- if ( style & wxBU_AUTODRAW )
- SetMargins(4, 4);
-
- return MSWCreateControl(_T("BUTTON"), wxEmptyString, pos, size);
-}
-
-WXDWORD wxBitmapButton::MSWGetStyle(long style, WXDWORD *exstyle) const
-{
- WXDWORD msStyle = wxButton::MSWGetStyle(style, exstyle);
-
- msStyle |= BS_OWNERDRAW;
-
- if ( style & wxBU_LEFT )
- msStyle |= BS_LEFT;
- if ( style & wxBU_RIGHT )
- msStyle |= BS_RIGHT;
- if ( style & wxBU_TOP )
- msStyle |= BS_TOP;
- if ( style & wxBU_BOTTOM )
- msStyle |= BS_BOTTOM;
-
- return msStyle;
-}
-
-bool wxBitmapButton::SetBackgroundColour(const wxColour& colour)
-{
- if ( !wxBitmapButtonBase::SetBackgroundColour(colour) )
- {
- // didn't change
- return false;
- }
-
- // invalidate the brush, it will be recreated the next time it's needed
- m_brushDisabled = wxNullBrush;
-
return true;
}
-void wxBitmapButton::OnSysColourChanged(wxSysColourChangedEvent& event)
-{
- m_brushDisabled = wxNullBrush;
-
- if ( !IsEnabled() )
- {
- // this change affects our current state
- Refresh();
- }
-
- event.Skip();
-}
-
-void wxBitmapButton::OnMouseEnterOrLeave(wxMouseEvent& event)
-{
- if ( IsEnabled() && m_bitmaps[State_Current].IsOk() )
- Refresh();
-
- event.Skip();
-}
-
void wxBitmapButton::DoSetBitmap(const wxBitmap& bitmap, State which)
{
if ( bitmap.IsOk() )
if ( !HasFlag(wxBU_AUTODRAW) && !m_disabledSetByUser )
{
wxImage img(bitmap.ConvertToImage().ConvertToGreyscale());
- m_bitmaps[State_Disabled] = wxBitmap(img);
+ wxBitmapButtonBase::DoSetBitmap(img, State_Disabled);
}
break;
#endif // wxUSE_IMAGE
// all platforms (some of them, such as Windows XP, have "hot"
// buttons while others don't)
if ( !m_hoverSetByUser )
- m_bitmaps[State_Current] = bitmap;
+ wxBitmapButtonBase::DoSetBitmap(bitmap, State_Current);
break;
case State_Current:
wxBitmapButtonBase::DoSetBitmap(bitmap, which);
}
-#if wxUSE_UXTHEME
-static
-void MSWDrawXPBackground(wxButton *button, WXDRAWITEMSTRUCT *wxdis)
-{
- LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT)wxdis;
- HDC hdc = lpDIS->hDC;
- UINT state = lpDIS->itemState;
- RECT rectBtn;
- CopyRect(&rectBtn, &lpDIS->rcItem);
-
- wxUxThemeHandle theme(button, L"BUTTON");
- int iState;
-
- if ( state & ODS_SELECTED )
- {
- iState = PBS_PRESSED;
- }
- else if ( button->HasCapture() || button->IsMouseInWindow() )
- {
- iState = PBS_HOT;
- }
- else if ( state & ODS_FOCUS )
- {
- iState = PBS_DEFAULTED;
- }
- else if ( state & ODS_DISABLED )
- {
- iState = PBS_DISABLED;
- }
- else
- {
- iState = PBS_NORMAL;
- }
-
- // draw parent background if needed
- if ( wxUxThemeEngine::Get()->IsThemeBackgroundPartiallyTransparent(theme,
- BP_PUSHBUTTON,
- iState) )
- {
- wxUxThemeEngine::Get()->DrawThemeParentBackground(GetHwndOf(button), hdc, &rectBtn);
- }
-
- // draw background
- wxUxThemeEngine::Get()->DrawThemeBackground(theme, hdc, BP_PUSHBUTTON, iState,
- &rectBtn, NULL);
-
- // calculate content area margins
- MARGINS margins;
- wxUxThemeEngine::Get()->GetThemeMargins(theme, hdc, BP_PUSHBUTTON, iState,
- TMT_CONTENTMARGINS, &rectBtn, &margins);
- RECT rectClient;
- ::CopyRect(&rectClient, &rectBtn);
- ::InflateRect(&rectClient, -margins.cxLeftWidth, -margins.cyTopHeight);
-
- // if focused and !nofocus rect
- if ( (state & ODS_FOCUS) && !(state & ODS_NOFOCUSRECT) )
- {
- DrawFocusRect(hdc, &rectClient);
- }
-
- if ( button->UseBgCol() )
- {
- COLORREF colBg = wxColourToRGB(button->GetBackgroundColour());
- HBRUSH hbrushBackground = ::CreateSolidBrush(colBg);
-
- // don't overwrite the focus rect
- ::InflateRect(&rectClient, -1, -1);
- FillRect(hdc, &rectClient, hbrushBackground);
- ::DeleteObject(hbrushBackground);
- }
-}
-#endif // wxUSE_UXTHEME
-
-// VZ: should be at the very least less than wxDEFAULT_BUTTON_MARGIN
-#define FOCUS_MARGIN 3
-
-bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
-{
-#ifndef __WXWINCE__
- long style = GetWindowLong((HWND) GetHWND(), GWL_STYLE);
- if (style & BS_BITMAP)
- {
- // Let default procedure draw the bitmap, which is defined
- // in the Windows resource.
- return false;
- }
-#endif
-
- LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT) item;
- HDC hDC = lpDIS->hDC;
- UINT state = lpDIS->itemState;
- bool isSelected = (state & ODS_SELECTED) != 0;
- bool autoDraw = HasFlag(wxBU_AUTODRAW);
-
-
- // choose the bitmap to use depending on the button state
- wxBitmap bitmap;
-
- if ( isSelected )
- bitmap = GetBitmapSelected();
- else if ( IsMouseInWindow() )
- bitmap = GetBitmapCurrent();
- else if ( state & ODS_DISABLED )
- bitmap = GetBitmapDisabled();
-
- if ( !bitmap.IsOk() )
- {
- if ( state & ODS_FOCUS )
- bitmap = GetBitmapFocus();
-
- if ( !bitmap.IsOk() )
- bitmap = GetBitmapLabel();
-
- if ( !bitmap.IsOk() )
- return false;
- }
-
- // centre the bitmap in the control area
- int x = lpDIS->rcItem.left;
- int y = lpDIS->rcItem.top;
- int width = lpDIS->rcItem.right - x;
- int height = lpDIS->rcItem.bottom - y;
- int wBmp = bitmap.GetWidth();
- int hBmp = bitmap.GetHeight();
-
-#if wxUSE_UXTHEME
- if ( autoDraw && wxUxThemeEngine::GetIfActive() )
- {
- MSWDrawXPBackground(this, item);
- wxUxThemeHandle theme(this, L"BUTTON");
-
- // calculate content area margins
- // assuming here that each state is the same size
- MARGINS margins;
- wxUxThemeEngine::Get()->GetThemeMargins(theme, NULL,
- BP_PUSHBUTTON, PBS_NORMAL,
- TMT_CONTENTMARGINS, NULL,
- &margins);
- int marginX = margins.cxLeftWidth + 1;
- int marginY = margins.cyTopHeight + 1;
- int x1,y1;
-
- if ( m_windowStyle & wxBU_LEFT )
- {
- x1 = x + marginX;
- }
- else if ( m_windowStyle & wxBU_RIGHT )
- {
- x1 = x + (width - wBmp) - marginX;
- }
- else
- {
- x1 = x + (width - wBmp) / 2;
- }
-
- if ( m_windowStyle & wxBU_TOP )
- {
- y1 = y + marginY;
- }
- else if ( m_windowStyle & wxBU_BOTTOM )
- {
- y1 = y + (height - hBmp) - marginY;
- }
- else
- {
- y1 = y + (height - hBmp) / 2;
- }
-
- // draw the bitmap
- wxDCTemp dst((WXHDC)hDC);
- dst.DrawBitmap(bitmap, x1, y1, true);
-
- return true;
- }
-#endif // wxUSE_UXTHEME
-
- int x1,y1;
-
- if(m_windowStyle & wxBU_LEFT)
- x1 = x + (FOCUS_MARGIN+1);
- else if(m_windowStyle & wxBU_RIGHT)
- x1 = x + (width - wBmp) - (FOCUS_MARGIN+1);
- else
- x1 = x + (width - wBmp) / 2;
-
- if(m_windowStyle & wxBU_TOP)
- y1 = y + (FOCUS_MARGIN+1);
- else if(m_windowStyle & wxBU_BOTTOM)
- y1 = y + (height - hBmp) - (FOCUS_MARGIN+1);
- else
- y1 = y + (height - hBmp) / 2;
-
- if ( isSelected && autoDraw )
- {
- x1++;
- y1++;
- }
-
- // draw the face, if auto-drawing
- if ( autoDraw )
- {
- DrawFace((WXHDC) hDC,
- lpDIS->rcItem.left, lpDIS->rcItem.top,
- lpDIS->rcItem.right, lpDIS->rcItem.bottom,
- isSelected);
- }
-
- // draw the bitmap
- wxDCTemp dst((WXHDC)hDC);
- dst.DrawBitmap(bitmap, x1, y1, true);
-
- // draw focus / disabled state, if auto-drawing
- if ( (state & ODS_DISABLED) && autoDraw )
- {
- DrawButtonDisable((WXHDC) hDC,
- lpDIS->rcItem.left, lpDIS->rcItem.top,
- lpDIS->rcItem.right, lpDIS->rcItem.bottom,
- true);
- }
- else if ( (state & ODS_FOCUS) && autoDraw )
- {
- DrawButtonFocus((WXHDC) hDC,
- lpDIS->rcItem.left,
- lpDIS->rcItem.top,
- lpDIS->rcItem.right,
- lpDIS->rcItem.bottom,
- isSelected);
- }
-
- return true;
-}
-
-// GRG Feb/2000, support for bmp buttons with Win95/98 standard LNF
-
-void wxBitmapButton::DrawFace( WXHDC dc, int left, int top,
- int right, int bottom, bool sel )
-{
- HPEN oldp;
- HPEN penHiLight;
- HPEN penLight;
- HPEN penShadow;
- HPEN penDkShadow;
- HBRUSH brushFace;
-
- // create needed pens and brush
- penHiLight = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DHILIGHT));
- penLight = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DLIGHT));
- penShadow = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DSHADOW));
- penDkShadow = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DDKSHADOW));
- brushFace = CreateSolidBrush(GetSysColor(COLOR_BTNFACE));
-
- // draw the rectangle
- RECT rect;
- rect.left = left;
- rect.right = right;
- rect.top = top;
- rect.bottom = bottom;
- FillRect((HDC) dc, &rect, brushFace);
-
- // draw the border
- oldp = (HPEN) SelectObject( (HDC) dc, sel? penDkShadow : penHiLight);
-
- wxDrawLine((HDC) dc, left, top, right-1, top);
- wxDrawLine((HDC) dc, left, top+1, left, bottom-1);
-
- SelectObject( (HDC) dc, sel? penShadow : penLight);
- wxDrawLine((HDC) dc, left+1, top+1, right-2, top+1);
- wxDrawLine((HDC) dc, left+1, top+2, left+1, bottom-2);
-
- SelectObject( (HDC) dc, sel? penLight : penShadow);
- wxDrawLine((HDC) dc, left+1, bottom-2, right-1, bottom-2);
- wxDrawLine((HDC) dc, right-2, bottom-3, right-2, top);
-
- SelectObject( (HDC) dc, sel? penHiLight : penDkShadow);
- wxDrawLine((HDC) dc, left, bottom-1, right+2, bottom-1);
- wxDrawLine((HDC) dc, right-1, bottom-2, right-1, top-1);
-
- // delete allocated resources
- SelectObject((HDC) dc,oldp);
- DeleteObject(penHiLight);
- DeleteObject(penLight);
- DeleteObject(penShadow);
- DeleteObject(penDkShadow);
- DeleteObject(brushFace);
-}
-
-void wxBitmapButton::DrawButtonFocus( WXHDC dc, int left, int top, int right,
- int bottom, bool WXUNUSED(sel) )
-{
- RECT rect;
- rect.left = left;
- rect.top = top;
- rect.right = right;
- rect.bottom = bottom;
- InflateRect( &rect, - FOCUS_MARGIN, - FOCUS_MARGIN );
-
- // GRG: the focus rectangle should not move when the button is pushed!
-/*
- if ( sel )
- OffsetRect( &rect, 1, 1 );
-*/
-
- DrawFocusRect( (HDC) dc, &rect );
-}
-
-void
-wxBitmapButton::DrawButtonDisable( WXHDC dc,
- int left, int top, int right, int bottom,
- bool with_marg )
-{
- if ( !m_brushDisabled.IsOk() )
- {
- // draw a bitmap with two black and two background colour pixels
- wxBitmap bmp(2, 2);
- wxMemoryDC dc;
- dc.SelectObject(bmp);
- dc.SetPen(*wxBLACK_PEN);
- dc.DrawPoint(0, 0);
- dc.DrawPoint(1, 1);
- dc.SetPen(GetBackgroundColour());
- dc.DrawPoint(0, 1);
- dc.DrawPoint(1, 0);
-
- m_brushDisabled = wxBrush(bmp);
- }
-
- SelectInHDC selectBrush((HDC)dc, GetHbrushOf(m_brushDisabled));
-
- // ROP for "dest |= pattern" operation -- as it doesn't have a standard
- // name, give it our own
- static const DWORD PATTERNPAINT = 0xFA0089UL;
-
- if ( with_marg )
- {
- left += m_marginX;
- top += m_marginY;
- right -= 2 * m_marginX;
- bottom -= 2 * m_marginY;
- }
-
- ::PatBlt( (HDC) dc, left, top, right, bottom, PATTERNPAINT);
-}
-
-wxSize wxBitmapButton::DoGetBestSize() const
-{
- if ( GetBitmapLabel().IsOk() )
- {
- int width = GetBitmapLabel().GetWidth(),
- height = GetBitmapLabel().GetHeight();
- int marginH = 0,
- marginV = 0;
-
-#if wxUSE_UXTHEME
- if ( wxUxThemeEngine::GetIfActive() )
- {
- wxUxThemeHandle theme((wxBitmapButton *)this, L"BUTTON");
-
- MARGINS margins;
- wxUxThemeEngine::Get()->GetThemeMargins(theme, NULL,
- BP_PUSHBUTTON, PBS_NORMAL,
- TMT_CONTENTMARGINS, NULL,
- &margins);
-
- // XP doesn't draw themed buttons correctly when the client area is
- // smaller than 8x8 - enforce this minimum size for small bitmaps
- if ( width < 8 )
- width = 8;
- if ( height < 8 )
- height = 8;
-
- // don't add margins for the borderless buttons, they don't need
- // them and it just makes them appear larger than needed
- if ( !HasFlag(wxBORDER_NONE) )
- {
- // we need 2 extra pixels for the focus rectangle, without them
- // it's overwritten by the bitmap itself
- marginH = margins.cxLeftWidth + margins.cxRightWidth + 2;
- marginV = margins.cyTopHeight + margins.cyBottomHeight + 2;
- }
- }
- else
-#endif // wxUSE_UXTHEME
- {
- if ( !HasFlag(wxBORDER_NONE) )
- {
- marginH = 2*m_marginX;
- marginV = 2*m_marginY;
- }
- }
-
- wxSize best(width + marginH, height + marginV);
- CacheBestSize(best);
- return best;
- }
-
- // no idea what our best size should be, defer to the base class
- return wxBitmapButtonBase::DoGetBestSize();
-}
-
#endif // wxUSE_BMPBUTTON
m_dir = wxLEFT;
- m_margin.x = btn->GetCharWidth();
- m_margin.y = btn->GetCharHeight() / 2;
+ // we use margins when we have both bitmap and text, but when we have
+ // only the bitmap it should take up the entire button area
+ if ( !btn->GetLabel().empty() )
+ {
+ m_margin.x = btn->GetCharWidth();
+ m_margin.y = btn->GetCharHeight() / 2;
+ }
}
virtual wxBitmap GetBitmap(wxButton::State which) const
virtual wxSize GetBitmapMargins() const
{
- return m_margin + wxSize(OD_BUTTON_MARGIN, OD_BUTTON_MARGIN);
+ return m_margin;
}
virtual void SetBitmapMargins(wxCoord x, wxCoord y)
#if wxUSE_UXTHEME
+// somehow the margin is one pixel greater than the value returned by
+// GetThemeMargins() call
+const int XP_BUTTON_EXTRA_MARGIN = 1;
+
class wxXPButtonImageData : public wxButtonImageData
{
public:
// and default alignment
m_data.uAlign = BUTTON_IMAGELIST_ALIGN_LEFT;
+
+ UpdateImageInfo();
}
virtual wxBitmap GetBitmap(wxButton::State which) const
wxSize wxButton::DoGetBestSize() const
{
- wxSize size = wxMSWButton::ComputeBestSize(const_cast<wxButton *>(this));
+ wxSize size;
+
+ // account for the text part
+ if ( !GetLabel().empty() )
+ {
+ size = wxMSWButton::ComputeBestSize(const_cast<wxButton *>(this));
+ }
+
if ( m_imageData )
{
+ // account for the bitmap size
const wxSize sizeBmp = m_imageData->GetBitmap(State_Normal).GetSize();
const wxDirection dirBmp = m_imageData->GetBitmapPosition();
if ( dirBmp == wxLEFT || dirBmp == wxRIGHT )
size.x = sizeBmp.x;
}
+ // account for the user-specified margins
size += 2*m_imageData->GetBitmapMargins();
+ // and also for the margins we always add internally
+ int marginH = 0,
+ marginV = 0;
+#if wxUSE_UXTHEME
+ if ( wxUxThemeEngine::GetIfActive() )
+ {
+ wxUxThemeHandle theme(const_cast<wxButton *>(this), L"BUTTON");
+
+ MARGINS margins;
+ wxUxThemeEngine::Get()->GetThemeMargins(theme, NULL,
+ BP_PUSHBUTTON, PBS_NORMAL,
+ TMT_CONTENTMARGINS, NULL,
+ &margins);
+
+ // XP doesn't draw themed buttons correctly when the client area is
+ // smaller than 8x8 - enforce this minimum size for small bitmaps
+ size.IncTo(wxSize(8, 8));
+
+ // don't add margins for the borderless buttons, they don't need
+ // them and it just makes them appear larger than needed
+ if ( !HasFlag(wxBORDER_NONE) )
+ {
+ marginH = margins.cxLeftWidth + margins.cxRightWidth
+ + 2*XP_BUTTON_EXTRA_MARGIN;
+ marginV = margins.cyTopHeight + margins.cyBottomHeight
+ + 2*XP_BUTTON_EXTRA_MARGIN;
+ }
+ }
+ else
+#endif // wxUSE_UXTHEME
+ {
+ marginH =
+ marginV = OD_BUTTON_MARGIN;
+ }
+
+ size.IncBy(marginH, marginV);
+
CacheBestSize(size);
}
nMsg == WM_MOUSELEAVE )
{
if (
+ IsEnabled() &&
+ (
#if wxUSE_UXTHEME
wxUxThemeEngine::GetIfActive() ||
#endif // wxUSE_UXTHEME
m_imageData && m_imageData->GetBitmap(State_Current).IsOk()
+ )
)
{
Refresh();
if ( !m_imageData )
{
#if wxUSE_UXTHEME
- if ( wxUxThemeEngine::GetIfActive() )
+ // using image list doesn't work correctly if we don't have any label
+ // (even if we use BUTTON_IMAGELIST_ALIGN_CENTER alignment and
+ // BS_BITMAP style), at least under Windows 2003 so use owner drawn
+ // strategy for bitmap-only buttons
+ if ( !GetLabel().empty() && wxUxThemeEngine::GetIfActive() )
{
m_imageData = new wxXPButtonImageData(this, bitmap);
}
{
m_imageData->SetBitmap(bitmap, which);
}
+
+ Refresh();
+}
+
+wxSize wxButton::DoGetBitmapMargins() const
+{
+ return m_imageData ? m_imageData->GetBitmapMargins() : wxSize(0, 0);
}
void wxButton::DoSetBitmapMargins(wxCoord x, wxCoord y)
engine->GetThemeMargins(theme, hdc, BP_PUSHBUTTON, iState,
TMT_CONTENTMARGINS, &rectBtn, &margins);
::InflateRect(&rectBtn, -margins.cxLeftWidth, -margins.cyTopHeight);
+ ::InflateRect(&rectBtn, -XP_BUTTON_EXTRA_MARGIN, -XP_BUTTON_EXTRA_MARGIN);
if ( button->UseBgCol() )
{
RECT rectBtn;
CopyRect(&rectBtn, &lpDIS->rcItem);
+ const wxString label = GetLabel();
+
// draw the button background
#if wxUSE_UXTHEME
if ( wxUxThemeEngine::GetIfActive() )
// finally draw the label
- COLORREF colFg = state & ODS_DISABLED
- ? ::GetSysColor(COLOR_GRAYTEXT)
- : wxColourToRGB(GetForegroundColour());
-
- // notice that DT_HIDEPREFIX doesn't work on old (pre-Windows 2000) systems
- // but by happy coincidence ODS_NOACCEL is not used under them neither so
- // DT_HIDEPREFIX should never be used there
- DrawButtonText(hdc, &rectBtn, GetLabel(), colFg,
- state & ODS_NOACCEL ? DT_HIDEPREFIX : 0);
+ if ( !label.empty() )
+ {
+ COLORREF colFg = state & ODS_DISABLED
+ ? ::GetSysColor(COLOR_GRAYTEXT)
+ : wxColourToRGB(GetForegroundColour());
+
+ // notice that DT_HIDEPREFIX doesn't work on old (pre-Windows 2000)
+ // systems but by happy coincidence ODS_NOACCEL is not used under them
+ // neither so DT_HIDEPREFIX should never be used there
+ DrawButtonText(hdc, &rectBtn, label, colFg,
+ state & ODS_NOACCEL ? DT_HIDEPREFIX : 0);
+ }
return true;
}
projects / wxWidgets.git / commitdiff
