respect wxBU_EXACTFIT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2282,14 +2282,17 @@ void wxGTKRenderer::AdjustSize(wxSize *size, const wxWindow *window)
|
||||
{
|
||||
if ( wxDynamicCast(window, wxButton) )
|
||||
{
|
||||
// TODO: this is ad hoc...
|
||||
size->x += 3*window->GetCharWidth();
|
||||
wxCoord minBtnHeight = 18;
|
||||
if ( size->y < minBtnHeight )
|
||||
size->y = minBtnHeight;
|
||||
if ( !(window->GetWindowStyle() & wxBU_EXACTFIT) )
|
||||
{
|
||||
// TODO: this is ad hoc...
|
||||
size->x += 3*window->GetCharWidth();
|
||||
wxCoord minBtnHeight = 18;
|
||||
if ( size->y < minBtnHeight )
|
||||
size->y = minBtnHeight;
|
||||
|
||||
// button border width
|
||||
size->y += 4;
|
||||
// button border width
|
||||
size->y += 4;
|
||||
}
|
||||
}
|
||||
else if ( wxDynamicCast(window, wxScrollBar) )
|
||||
{
|
||||
|
Reference in New Issue
Block a user