Factor out the OnSize code so it can also be used in other places

where the header window needs to be adjusted.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/contrib/gizmos/wxCode/include/wx/treelistctrl.h b/wxPython/contrib/gizmos/wxCode/include/wx/treelistctrl.h
index ad8190dac9a3fb532dd62a593f3aa36b6c6dad0b..7746a96d36a8b0d52a0ff3aa3836329fbcb8219b 100644 (file)
--- a/wxPython/contrib/gizmos/wxCode/include/wx/treelistctrl.h
+++ b/wxPython/contrib/gizmos/wxCode/include/wx/treelistctrl.h
@@ -545,7 +545,7 @@ protected:
 
     void OnSize(wxSizeEvent& event);
     void CalculateAndSetHeaderHeight();
 
     void OnSize(wxSizeEvent& event);
     void CalculateAndSetHeaderHeight();

-    
+    void DoHeaderLayout();

 
 private:
     size_t fill_column;
 
 private:
     size_t fill_column;

diff --git a/wxPython/contrib/gizmos/wxCode/src/treelistctrl.cpp b/wxPython/contrib/gizmos/wxCode/src/treelistctrl.cpp
index c178ad47ebf40455d1dff9a778635232aafe149b..bebd08d5f1ffd992275dfbf05a061ce17dda3272 100644 (file)
--- a/wxPython/contrib/gizmos/wxCode/src/treelistctrl.cpp
+++ b/wxPython/contrib/gizmos/wxCode/src/treelistctrl.cpp
@@ -4653,8 +4653,7 @@ void wxTreeListCtrl::CalculateAndSetHeaderHeight()
     }
 }
 
     }
 }
 

-
-void wxTreeListCtrl::OnSize(wxSizeEvent& WXUNUSED(event))
+void wxTreeListCtrl::DoHeaderLayout()

 {
     int w, h;
     GetClientSize(&w, &h);
 {
     int w, h;
     GetClientSize(&w, &h);


@@ -4665,6 +4664,11 @@ void wxTreeListCtrl::OnSize(wxSizeEvent& WXUNUSED(event))
     }
     if (m_main_win)
         m_main_win->SetSize(0, m_headerHeight + 1, w, h - m_headerHeight - 1);
     }
     if (m_main_win)
         m_main_win->SetSize(0, m_headerHeight + 1, w, h - m_headerHeight - 1);

+}    
+
+void wxTreeListCtrl::OnSize(wxSizeEvent& WXUNUSED(event))
+{
+    DoHeaderLayout();

 }
 
 
 }
 
 


@@ -5015,7 +5019,10 @@ wxString wxTreeListCtrl::GetColumnText(size_t column) const
 { return m_header_win->GetColumnText(column); }
 
 void wxTreeListCtrl::AddColumn(const wxTreeListColumnInfo& col)
 { return m_header_win->GetColumnText(column); }
 
 void wxTreeListCtrl::AddColumn(const wxTreeListColumnInfo& col)

-{ m_header_win->AddColumn(col); }
+{
+    m_header_win->AddColumn(col);
+    DoHeaderLayout();
+}

 
 void wxTreeListCtrl::InsertColumn(size_t before,
                                   const wxTreeListColumnInfo& col)
 
 void wxTreeListCtrl::InsertColumn(size_t before,
                                   const wxTreeListColumnInfo& col)