X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d59bf6889572ca5789854b0ba1e418dfca23a2c..6d7b547184bfdcdf67790755deb0122050b1d728:/src/aui/auibook.cpp?ds=sidebyside diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp index da6a2edd7c..1792957c05 100644 --- a/src/aui/auibook.cpp +++ b/src/aui/auibook.cpp @@ -313,7 +313,7 @@ void wxAuiTabContainer::AddButton(int id, const wxBitmap& bmp) void wxAuiTabContainer::DrawTab(wxDC* dc, const wxRect& in_rect, - const wxString& _caption, + const wxString& caption_text, bool active, wxRect* out_rect, int* x_extent) @@ -325,8 +325,8 @@ void wxAuiTabContainer::DrawTab(wxDC* dc, // if the caption is empty, measure some temporary text - wxString caption = _caption; - if (_caption.IsEmpty()) + wxString caption = caption_text; + if (caption_text.empty()) caption = wxT("Xj"); // measure text @@ -339,7 +339,7 @@ void wxAuiTabContainer::DrawTab(wxDC* dc, dc->SetFont(m_normal_font); dc->GetTextExtent(caption, &normal_textx, &normal_texty); - caption = _caption; + caption = caption_text; wxCoord tab_height = measured_texty + 4; wxCoord tab_width = measured_textx + tab_height + 5; @@ -1126,9 +1126,9 @@ bool wxAuiMultiNotebook::SetPageText(size_t page_idx, const wxString& text) wxAuiNotebookPage& info = ctrl->GetPage(ctrl_idx); info.caption = text; ctrl->Refresh(); + ctrl->Update(); } - return true; }