fixing osx_carbon

[wxWidgets.git] / src / common / headerctrlcmn.cpp

diff --git a/src/common/headerctrlcmn.cpp b/src/common/headerctrlcmn.cpp
index 1299bb9a37a7b3b7bc271a0798b432c6f7af57ee..4e32625c6b536cda52afe7633119e1ead95fddf4 100644 (file)
--- a/src/common/headerctrlcmn.cpp
+++ b/src/common/headerctrlcmn.cpp
@@ -45,6 +45,8 @@ const unsigned int wxNO_COLUMN = static_cast<unsigned>(-1);
 // wxHeaderColumnsRearrangeDialog: dialog for customizing our columns
 // ----------------------------------------------------------------------------
 
+#if wxUSE_REARRANGECTRL
+
 class wxHeaderColumnsRearrangeDialog : public wxRearrangeDialog
 {
 public:
@@ -63,6 +65,8 @@ public:
     }
 };
 
+#endif // wxUSE_REARRANGECTRL
+
 } // anonymous namespace
 
 // ============================================================================
@@ -110,8 +114,15 @@ void wxHeaderCtrlBase::SetColumnCount(unsigned int count)
 void wxHeaderCtrlBase::OnSeparatorDClick(wxHeaderCtrlEvent& event)
 {
     const unsigned col = event.GetColumn();
+    const wxHeaderColumn& column = GetColumn(col);
+
+    if ( !column.IsResizeable() )
+    {
+        event.Skip();
+        return;
+    }
 
-    int w = wxWindowBase::GetTextExtent(GetColumn(col).GetTitle()).x;
+    int w = wxWindowBase::GetTextExtent(column.GetTitle()).x;
     w += 4*GetCharWidth(); // add some arbitrary margins around text
 
     if ( !UpdateColumnWidthToFit(col, w) )