fixed variable name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -313,7 +313,7 @@ void wxAuiTabContainer::AddButton(int id, const wxBitmap& bmp)
|
|||||||
|
|
||||||
void wxAuiTabContainer::DrawTab(wxDC* dc,
|
void wxAuiTabContainer::DrawTab(wxDC* dc,
|
||||||
const wxRect& in_rect,
|
const wxRect& in_rect,
|
||||||
const wxString& _caption,
|
const wxString& caption_text,
|
||||||
bool active,
|
bool active,
|
||||||
wxRect* out_rect,
|
wxRect* out_rect,
|
||||||
int* x_extent)
|
int* x_extent)
|
||||||
@@ -325,8 +325,8 @@ void wxAuiTabContainer::DrawTab(wxDC* dc,
|
|||||||
|
|
||||||
|
|
||||||
// if the caption is empty, measure some temporary text
|
// if the caption is empty, measure some temporary text
|
||||||
wxString caption = _caption;
|
wxString caption = caption_text;
|
||||||
if (_caption.IsEmpty())
|
if (caption_text.IsEmpty())
|
||||||
caption = wxT("Xj");
|
caption = wxT("Xj");
|
||||||
|
|
||||||
// measure text
|
// measure text
|
||||||
@@ -339,7 +339,7 @@ void wxAuiTabContainer::DrawTab(wxDC* dc,
|
|||||||
dc->SetFont(m_normal_font);
|
dc->SetFont(m_normal_font);
|
||||||
dc->GetTextExtent(caption, &normal_textx, &normal_texty);
|
dc->GetTextExtent(caption, &normal_textx, &normal_texty);
|
||||||
|
|
||||||
caption = _caption;
|
caption = caption_text;
|
||||||
|
|
||||||
wxCoord tab_height = measured_texty + 4;
|
wxCoord tab_height = measured_texty + 4;
|
||||||
wxCoord tab_width = measured_textx + tab_height + 5;
|
wxCoord tab_width = measured_textx + tab_height + 5;
|
||||||
|
|||||||
Reference in New Issue
Block a user