X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aadbdd1699e512735a6e63798530192b1f9cb09b..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/common/headerctrlcmn.cpp

diff --git a/src/common/headerctrlcmn.cpp b/src/common/headerctrlcmn.cpp
index be858a6848..98025723ad 100644
--- a/src/common/headerctrlcmn.cpp
+++ b/src/common/headerctrlcmn.cpp
@@ -31,6 +31,7 @@
 
 #include "wx/headerctrl.h"
 #include "wx/rearrangectrl.h"
+#include "wx/renderer.h"
 
 namespace
 {
@@ -107,6 +108,21 @@ void wxHeaderCtrlBase::SetColumnCount(unsigned int count)
     DoSetCount(count);
 }
 
+int wxHeaderCtrlBase::GetColumnTitleWidth(const wxHeaderColumn& col)
+{
+    int w = wxWindowBase::GetTextExtent(col.GetTitle()).x;
+
+    // add some margin:
+    w += wxRendererNative::Get().GetHeaderButtonMargin(this);
+
+    // if a bitmap is used, add space for it and 2px border:
+    wxBitmap bmp = col.GetBitmap();
+    if ( bmp.IsOk() )
+        w += bmp.GetWidth() + 2;
+
+    return w;
+}
+
 // ----------------------------------------------------------------------------
 // wxHeaderCtrlBase event handling
 // ----------------------------------------------------------------------------
@@ -122,8 +138,7 @@ void wxHeaderCtrlBase::OnSeparatorDClick(wxHeaderCtrlEvent& event)
         return;
     }
 
-    int w = wxWindowBase::GetTextExtent(column.GetTitle()).x;
-    w += 4*GetCharWidth(); // add some arbitrary margins around text
+    int w = GetColumnTitleWidth(column);
 
     if ( !UpdateColumnWidthToFit(col, w) )
         event.Skip();