Fixes according to patch #1523304.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -873,7 +873,7 @@ void wxToolBar::DrawTool( wxDC& rDc, wxToolBarToolBase* pToolBase )
|
|||||||
GetSize(&vX, &vY);
|
GetSize(&vX, &vY);
|
||||||
rDc.DrawText( pTool->GetLabel()
|
rDc.DrawText( pTool->GetLabel()
|
||||||
,vLeft
|
,vLeft
|
||||||
,vY - (m_vTextY - 2)
|
,vY - m_vTextY - 1
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
else // normal tools
|
else // normal tools
|
||||||
@@ -881,7 +881,7 @@ void wxToolBar::DrawTool( wxDC& rDc, wxToolBarToolBase* pToolBase )
|
|||||||
vLeft += (wxCoord)((m_vTextX - vX)/2);
|
vLeft += (wxCoord)((m_vTextX - vX)/2);
|
||||||
rDc.DrawText( pTool->GetLabel()
|
rDc.DrawText( pTool->GetLabel()
|
||||||
,vLeft
|
,vLeft
|
||||||
,pTool->m_vY + m_vTextY + 4 // a bit of margin
|
,pTool->m_vY + m_vTextY - 1 // a bit of margin
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -915,7 +915,7 @@ void wxToolBar::DrawTool( wxDC& rDc, wxToolBarToolBase* pToolBase )
|
|||||||
vLeft += (wxCoord)((m_vTextX - vX)/2);
|
vLeft += (wxCoord)((m_vTextX - vX)/2);
|
||||||
rDc.DrawText( pTool->GetLabel()
|
rDc.DrawText( pTool->GetLabel()
|
||||||
,vLeft
|
,vLeft
|
||||||
,pTool->m_vY + m_vTextY + 4 // a bit of margin
|
,pTool->m_vY + m_vTextY - 1 // a bit of margin
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user