extract setters from wxHeaderColumnBase into a separate wxSettableHeaderColumn class...

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

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 567eb55d576e77b8216ec6086b891946731644c4..34e2123b6c3ac89411baf6c2c50c3b341d0ddaa2 100644 (file)
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -832,38 +832,8 @@ void wxDataViewEditorCtrlEvtHandler::OnKillFocus( wxFocusEvent &event )
 // wxDataViewColumnBase
 // ---------------------------------------------------------
 
 // wxDataViewColumnBase
 // ---------------------------------------------------------
 

-IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumnBase, wxObject)
-
-wxDataViewColumnBase::wxDataViewColumnBase(const wxString& title,
-                                           wxDataViewRenderer *renderer,
-                                           unsigned int model_column,
-                                           int width,
-                                           wxAlignment align,
-                                           int flags)
-#ifdef wxHAS_GENERIC_DATAVIEWCTRL
-                    : wxHeaderColumn(title, width, align, flags)
-#endif
-{
-    m_renderer = renderer;
-    m_model_column = model_column;
-    m_owner = NULL;
-    m_renderer->SetOwner( (wxDataViewColumn*) this );
-
-    // NOTE: the wxDataViewColumn's ctor must store the width, align, flags
-    //       parameters inside the native control!
-}
-
-wxDataViewColumnBase::wxDataViewColumnBase(const wxBitmap& bitmap,
-                                           wxDataViewRenderer *renderer,
-                                           unsigned int model_column,
-                                           int width,
-                                           wxAlignment align,
-                                           int flags)
-#ifdef wxHAS_GENERIC_DATAVIEWCTRL
-                    : wxHeaderColumn(bitmap, width, align, flags)
-#else
-                    : m_bitmap(bitmap)
-#endif
+void wxDataViewColumnBase::Init(wxDataViewRenderer *renderer,
+                                unsigned int model_column)

 {
     m_renderer = renderer;
     m_model_column = model_column;
 {
     m_renderer = renderer;
     m_model_column = model_column;


@@ -1917,10 +1887,12 @@ void wxDataViewTreeCtrl::OnCollapsed( wxDataViewEvent &event )
 void wxDataViewTreeCtrl::OnSize( wxSizeEvent &event )
 {
 #if defined(wxUSE_GENERICDATAVIEWCTRL)
 void wxDataViewTreeCtrl::OnSize( wxSizeEvent &event )
 {
 #if defined(wxUSE_GENERICDATAVIEWCTRL)

-    wxSize size = GetClientSize();
-    wxDataViewColumn *col = GetColumn( 0 );
-    if (col)
-       col->SetWidth( size.x );
+    // automatically resize our only column to take the entire control width
+    if ( GetColumnCount() )
+    {
+        wxSize size = GetClientSize();
+        GetColumn(0)->SetWidth(size.x);
+    }

 #endif
     event.Skip( true );
 }
 #endif
     event.Skip( true );
 }