missing commit

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

diff --git a/src/aui/tabartgtk.cpp b/src/aui/tabartgtk.cpp
index 28bfaa6aafbf6851f8235ad82826c61a3f38fee3..357c71aa233362d1934be3ae330093846dc21e59 100644 (file)
--- a/src/aui/tabartgtk.cpp
+++ b/src/aui/tabartgtk.cpp
@@ -383,7 +383,8 @@ void wxAuiGtkTabArt::DrawTab(wxDC& dc, wxWindow* wnd, const wxAuiNotebookPage& p
         *out_button_rect = DrawCloseButton(dc, widget, close_button_state, rect, wxRIGHT, &area);
     }
 
         *out_button_rect = DrawCloseButton(dc, widget, close_button_state, rect, wxRIGHT, &area);
     }
 

-    tab_rect.width = std::min(tab_rect.width, clip_width);
+    if ( clip_width < tab_rect.width )
+        tab_rect.width = clip_width;

     *out_tab_rect = tab_rect;
 
     dc.DestroyClippingRegion();
     *out_tab_rect = tab_rect;
 
     dc.DestroyClippingRegion();


@@ -487,6 +488,11 @@ int wxAuiGtkTabArt::GetBorderWidth(wxWindow* wnd)
                                                            GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_vborder);
 }
 
                                                            GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_vborder);
 }
 

+int wxAuiGtkTabArt::GetAdditionalBorderSpace(wxWindow* wnd)
+{
+    return 2 * GetBorderWidth(wnd);
+}
+

 wxSize wxAuiGtkTabArt::GetTabSize(wxDC& dc,
                               wxWindow* wnd,
                               const wxString& caption,
 wxSize wxAuiGtkTabArt::GetTabSize(wxDC& dc,
                               wxWindow* wnd,
                               const wxString& caption,