handle correctly never/always shown scrollbars in GetClientSize()

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

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 5b7205f3d7c265c598b38c6e825c82914c3e5ed0..949ffa233fb3844ef035f4e45297e40665af6d00 100644 (file)
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -22,6 +22,7 @@
 #include "wx/choice.h"
 
 #include "wx/weakref.h"
 #include "wx/choice.h"
 
 #include "wx/weakref.h"

+#include "wx/vector.h"

 
 #ifndef WX_PRECOMP
     #include "wx/dc.h"
 
 #ifndef WX_PRECOMP
     #include "wx/dc.h"


@@ -832,55 +833,13 @@ 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
+void wxDataViewColumnBase::Init(wxDataViewRenderer *renderer,
+                                unsigned int model_column)

 {
     m_renderer = renderer;
     m_model_column = model_column;
     m_owner = NULL;
     m_renderer->SetOwner( (wxDataViewColumn*) this );
 {
     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!
-#ifndef wxHAS_GENERIC_DATAVIEWCTRL
-    wxUnusedVar(title);
-    wxUnusedVar(width);
-    wxUnusedVar(align);
-    wxUnusedVar(flags);
-#endif // !wxHAS_GENERIC_DATAVIEWCTRL
-}
-
-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
-{
-    m_renderer = renderer;
-    m_model_column = model_column;
-    m_owner = NULL;
-    m_renderer->SetOwner( (wxDataViewColumn*) this );
-
-#ifndef wxHAS_GENERIC_DATAVIEWCTRL
-    wxUnusedVar(width);
-    wxUnusedVar(align);
-    wxUnusedVar(flags);
-#endif // !wxHAS_GENERIC_DATAVIEWCTRL

 }
 
 wxDataViewColumnBase::~wxDataViewColumnBase()
 }
 
 wxDataViewColumnBase::~wxDataViewColumnBase()


@@ -937,6 +896,30 @@ const wxDataViewModel* wxDataViewCtrlBase::GetModel() const
     return m_model;
 }
 
     return m_model;
 }
 

+void wxDataViewCtrlBase::ExpandAncestors( const wxDataViewItem & item )
+{
+    if (!m_model) return;
+    
+    if (!item.IsOk()) return;
+
+    wxVector<wxDataViewItem> parentChain;
+    
+    // at first we get all the parents of the selected item
+    wxDataViewItem parent = m_model->GetParent(item);
+    while (parent.IsOk())
+    {
+        parentChain.push_back(parent);
+        parent = m_model->GetParent(parent);
+    }
+    
+    // then we expand the parents, starting at the root
+    while (!parentChain.empty())
+    {
+         Expand(parentChain.back());
+         parentChain.pop_back();
+    }
+}
+

 wxDataViewColumn *
 wxDataViewCtrlBase::AppendTextColumn( const wxString &label, unsigned int model_column,
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 wxDataViewColumn *
 wxDataViewCtrlBase::AppendTextColumn( const wxString &label, unsigned int model_column,
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )


@@ -1317,7 +1300,7 @@ bool wxDataViewSpinRenderer::GetValue( wxVariant &value ) const
 // wxDataViewChoiceRenderer
 // -------------------------------------
 
 // wxDataViewChoiceRenderer
 // -------------------------------------
 

-#ifndef __WXGTK20__
+#if defined(wxHAS_GENERIC_DATAVIEWCTRL) || defined(__WXMAC__)

 
 wxDataViewChoiceRenderer::wxDataViewChoiceRenderer( const wxArrayString& choices, wxDataViewCellMode mode, int alignment ) :
    wxDataViewCustomRenderer(wxT("string"), mode, alignment )
 
 wxDataViewChoiceRenderer::wxDataViewChoiceRenderer( const wxArrayString& choices, wxDataViewCellMode mode, int alignment ) :
    wxDataViewCustomRenderer(wxT("string"), mode, alignment )


@@ -1929,10 +1912,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 );
 }