1. replaced wxRenderer::AdjustScrollbar with AreScrollbarsInsideBorder(),

it now seems to work with GTK theme too
2. added checkbox bitmaps drawing under GTK


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/wxUNIVERSAL@8297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-09-08 14:34:12 +00:00
parent 925f7f2250
commit a10069108f
9 changed files with 157 additions and 112 deletions

View File

@@ -643,13 +643,13 @@ void wxControlRenderer::DrawLabelBox(const wxBitmap& bitmap, wxCoord margin)
if ( m_window->GetWindowStyle() & wxALIGN_RIGHT )
{
rectBmp.SetRight(m_rect.GetRight());
rectLabel.SetRight(rectBmp.GetLeft() - margin);
rectBmp.x = m_rect.GetRight() - rectBmp.width;
rectLabel.SetLeft(m_rect.GetLeft());
rectLabel.SetRight(rectBmp.GetLeft() - margin);
}
else // normal (checkbox to the left of the text) case
{
rectBmp.SetLeft(m_rect.GetLeft());
rectBmp.x = m_rect.GetLeft();
rectLabel.SetLeft(rectBmp.GetRight() + margin);
rectLabel.SetRight(m_rect.GetRight());
}