X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9fa99f045e39341d64b4ecffbaab6385d9982cee..87f0b1323b7ac77f02133b836c8dfee63b0fd387:/src/aui/tabartgtk.cpp diff --git a/src/aui/tabartgtk.cpp b/src/aui/tabartgtk.cpp index 28bfaa6aaf..357c71aa23 100644 --- 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); } - 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(); @@ -487,6 +488,11 @@ int wxAuiGtkTabArt::GetBorderWidth(wxWindow* wnd) 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,