Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

restore call to GetTabSize removed in r69880, it is needed to set x_extent

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2011-12-25 00:57:27 +00:00
parent 4a04898fe0
commit 0b3b8742c5
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/aui/auibook.cpp
View File

@@ -1935,7 +1935,7 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd)
} }
// Is the tab visible? // Is the tab visible?
bool wxAuiTabContainer::IsTabVisible(int tabPage, int tabOffset, wxDC* dc, wxWindow* /*wnd*/) bool wxAuiTabContainer::IsTabVisible(int tabPage, int tabOffset, wxDC* dc, wxWindow* wnd)
{ {
if (!dc || !dc->IsOk()) if (!dc || !dc->IsOk())
return false; return false;
@@ -2021,6 +2021,9 @@ bool wxAuiTabContainer::IsTabVisible(int tabPage, int tabOffset, wxDC* dc, wxWin
// See if the given page is visible at the given tab offset (effectively scroll position) // See if the given page is visible at the given tab offset (effectively scroll position)
for (i = tabOffset; i < page_count; ++i) for (i = tabOffset; i < page_count; ++i)
{ {
wxAuiNotebookPage& page = m_pages.Item(i);
wxAuiTabContainerButton& tab_button = m_tabCloseButtons.Item(i);
rect.x = offset; rect.x = offset;
rect.width = m_rect.width - right_buttons_width - offset - 2; rect.width = m_rect.width - right_buttons_width - offset - 2;
@@ -2028,6 +2031,14 @@ bool wxAuiTabContainer::IsTabVisible(int tabPage, int tabOffset, wxDC* dc, wxWin
return false; // haven't found the tab, and we've run out of space, so return false return false; // haven't found the tab, and we've run out of space, so return false
int x_extent = 0; int x_extent = 0;
m_art->GetTabSize(*dc,
wnd,
page.caption,
page.bitmap,
page.active,
tab_button.curState,
&x_extent);
offset += x_extent; offset += x_extent;
if (i == (size_t) tabPage) if (i == (size_t) tabPage)