merged 2.4 branch into the trunk

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions

View File

@@ -330,6 +330,7 @@ bool wxNotebook::InsertPage(int nPage,
bSelect = TRUE;
Relayout();
Refresh();
}
else // not the first tab
{
@@ -518,10 +519,20 @@ void wxNotebook::DoDraw(wxControlRenderer *renderer)
wxSize sizeSpinBtn = m_spinbtn->GetSize();
if ( IsVertical() )
{
rectTabs.height -= sizeSpinBtn.y;
// Allow for erasing the line under selected tab
rectTabs.width += 2;
}
else
{
rectTabs.width -= sizeSpinBtn.x;
// Allow for erasing the line under selected tab
rectTabs.height += 2;
}
dc.SetClippingRegion(rectTabs);
}
@@ -566,6 +577,8 @@ void wxNotebook::DoDraw(wxControlRenderer *renderer)
{
DoDrawTab(dc, rectSel, m_sel);
}
dc.DestroyClippingRegion();
}
// ----------------------------------------------------------------------------