Added size constants to allow drawn control parts to match the window variant,
initially on Mac git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1347,6 +1347,11 @@ void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, int paintBg )
|
||||
}
|
||||
|
||||
// Draw standard button
|
||||
if (GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_SMALL)
|
||||
drawState |= wxCONTROL_SIZE_SMALL;
|
||||
else if (GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_MINI)
|
||||
drawState |= wxCONTROL_SIZE_MINI;
|
||||
|
||||
wxRendererNative::Get().DrawComboBoxDropButton(this,
|
||||
dc,
|
||||
drawRect,
|
||||
@@ -1380,6 +1385,11 @@ void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, int paintBg )
|
||||
dc.DrawRectangle(rect);
|
||||
}
|
||||
|
||||
if (GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_SMALL)
|
||||
drawState |= wxCONTROL_SIZE_SMALL;
|
||||
else if (GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_MINI)
|
||||
drawState |= wxCONTROL_SIZE_MINI;
|
||||
|
||||
wxRendererNative::Get().DrawPushButton(this,
|
||||
dc,
|
||||
drawRect,
|
||||
|
Reference in New Issue
Block a user