updates from Adrián González Alba

[wxWidgets.git] / src / aui / auibook.cpp

diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp
index 2553b63f17c763b31e105904e055edf559543d78..1792957c05103433a3e0ae119fcddbe752237f09 100644 (file)
--- 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)
@@ -324,6 +324,11 @@ void wxAuiTabContainer::DrawTab(wxDC* dc,
     wxCoord textx, texty;
 
 
+    // if the caption is empty, measure some temporary text
+    wxString caption = caption_text;
+    if (caption_text.empty())
+        caption = wxT("Xj");
+        
     // measure text
     dc->SetFont(m_measuring_font);
     dc->GetTextExtent(caption, &measured_textx, &measured_texty);
@@ -334,6 +339,7 @@ void wxAuiTabContainer::DrawTab(wxDC* dc,
     dc->SetFont(m_normal_font);
     dc->GetTextExtent(caption, &normal_textx, &normal_texty);
 
+    caption = caption_text;
 
     wxCoord tab_height = measured_texty + 4;
     wxCoord tab_width = measured_textx + tab_height + 5;
@@ -824,6 +830,7 @@ public:
         m_tabs->SetSize(m_rect.x, m_rect.y, m_rect.width, tab_height);
         m_tabs->SetRect(wxRect(0, 0, m_rect.width, tab_height));
         m_tabs->Refresh();
+        m_tabs->Update();
 
         wxAuiNotebookPageArray& pages = m_tabs->GetPages();
         size_t i, page_count = pages.GetCount();
@@ -1119,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;
 }