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 645aa4ed0ebedae7bc6327a4bd3d3b73e791a71c..949ffa233fb3844ef035f4e45297e40665af6d00 100644 (file)
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -18,8 +18,11 @@
 #if wxUSE_DATAVIEWCTRL
 
 #include "wx/dataview.h"
 #if wxUSE_DATAVIEWCTRL
 
 #include "wx/dataview.h"

-

 #include "wx/spinctrl.h"
 #include "wx/spinctrl.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"


@@ -29,7 +32,7 @@
     #include "wx/crt.h"
 #endif
 
     #include "wx/crt.h"
 #endif
 

-const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl");
+const char wxDataViewCtrlNameStr[] = "dataviewCtrl";

 
 
 bool operator == (const wxDataViewItem &left, const wxDataViewItem &right)
 
 
 bool operator == (const wxDataViewItem &left, const wxDataViewItem &right)


@@ -40,7 +43,7 @@ bool operator == (const wxDataViewItem &left, const wxDataViewItem &right)
 #ifdef __WXDEBUG__
 void wxDataViewItem::Print(const wxString& text) const
 {
 #ifdef __WXDEBUG__
 void wxDataViewItem::Print(const wxString& text) const
 {

-    wxPrintf(wxT("item %s: %l\n"), text.GetData(), (long)m_id);
+    wxPrintf(wxT("item %s: %lu\n"), text.GetData(), wxPtrToUInt(m_id));

 }
 #endif
 
 }
 #endif
 


@@ -259,38 +262,41 @@ int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem
         wxString str1 = value1.GetString();
         wxString str2 = value2.GetString();
         int res = str1.Cmp( str2 );
         wxString str1 = value1.GetString();
         wxString str2 = value2.GetString();
         int res = str1.Cmp( str2 );

-        if (res) return res;
-    } else
-    if (value1.GetType() == wxT("long"))
+        if (res)
+            return res;
+    }
+    else if (value1.GetType() == wxT("long"))

     {
         long l1 = value1.GetLong();
         long l2 = value2.GetLong();
         long res = l1-l2;
     {
         long l1 = value1.GetLong();
         long l2 = value2.GetLong();
         long res = l1-l2;

-        if (res) return res;
-    } else
-    if (value1.GetType() == wxT("double"))
+        if (res)
+            return res;
+    }
+    else if (value1.GetType() == wxT("double"))

     {
         double d1 = value1.GetDouble();
         double d2 = value2.GetDouble();
     {
         double d1 = value1.GetDouble();
         double d2 = value2.GetDouble();

-        if (d1 < d2) return 1;
-        if (d1 > d2) return -1;
-    } else
-    if (value1.GetType() == wxT("datetime"))
+        if (d1 < d2)
+            return 1;
+        if (d1 > d2)
+            return -1;
+    }
+    else if (value1.GetType() == wxT("datetime"))

     {
         wxDateTime dt1 = value1.GetDateTime();
         wxDateTime dt2 = value2.GetDateTime();
     {
         wxDateTime dt1 = value1.GetDateTime();
         wxDateTime dt2 = value2.GetDateTime();

-        if (dt1.IsEarlierThan(dt2)) return 1;
-        if (dt2.IsEarlierThan(dt1)) return -11;
+        if (dt1.IsEarlierThan(dt2))
+            return 1;
+        if (dt2.IsEarlierThan(dt1))
+            return -11;

     }
 
     // items must be different
     }
 
     // items must be different

-    unsigned long litem1 = (unsigned long) item1.GetID();
-    unsigned long litem2 = (unsigned long) item2.GetID();
+    wxUIntPtr id1 = wxPtrToUInt(item1.GetID()),
+              id2 = wxPtrToUInt(item2.GetID());

 
 

-    if (!ascending)
-        return litem2-litem2;
-
-    return litem1-litem2;
+    return ascending ? id1 - id2 : id2 - id1;

 }
 
 // ---------------------------------------------------------
 }
 
 // ---------------------------------------------------------


@@ -307,11 +313,11 @@ wxDataViewIndexListModel::wxDataViewIndexListModel( unsigned int initial_size )
 {
     // IDs are ordered until an item gets deleted or inserted
     m_ordered = true;
 {
     // IDs are ordered until an item gets deleted or inserted
     m_ordered = true;

-    
+

     // build initial index
     unsigned int i;
     for (i = 1; i < initial_size+1; i++)
     // build initial index
     unsigned int i;
     for (i = 1; i < initial_size+1; i++)

-            m_hash.Add( (void*) i );
+            m_hash.Add( wxUIntToPtr(i) );

     m_lastIndex = initial_size + 1;
 }
 
     m_lastIndex = initial_size + 1;
 }
 


@@ -322,51 +328,51 @@ wxDataViewIndexListModel::~wxDataViewIndexListModel()
 void wxDataViewIndexListModel::Reset( unsigned int new_size )
 {
     m_hash.Clear();
 void wxDataViewIndexListModel::Reset( unsigned int new_size )
 {
     m_hash.Clear();

-    
+

     // IDs are ordered until an item gets deleted or inserted
     m_ordered = true;
     // IDs are ordered until an item gets deleted or inserted
     m_ordered = true;

-        
+

     // build initial index
     unsigned int i;
     for (i = 1; i < new_size+1; i++)
     // build initial index
     unsigned int i;
     for (i = 1; i < new_size+1; i++)

-            m_hash.Add( (void*) i );
+            m_hash.Add( wxUIntToPtr(i) );

     m_lastIndex = new_size + 1;
     m_lastIndex = new_size + 1;

-    
+

     wxDataViewModel::Cleared();
 }
 
 void wxDataViewIndexListModel::RowPrepended()
 {
     m_ordered = false;
     wxDataViewModel::Cleared();
 }
 
 void wxDataViewIndexListModel::RowPrepended()
 {
     m_ordered = false;

-    
+

     unsigned int id = m_lastIndex++;
     unsigned int id = m_lastIndex++;

-    m_hash.Insert( (void*) id, 0 );
-    wxDataViewItem item( (void*) id );
+    m_hash.Insert( wxUIntToPtr(id), 0 );
+    wxDataViewItem item( wxUIntToPtr(id) );

     ItemAdded( wxDataViewItem(0), item );
 }
 
 void wxDataViewIndexListModel::RowInserted( unsigned int before )
 {
     m_ordered = false;
     ItemAdded( wxDataViewItem(0), item );
 }
 
 void wxDataViewIndexListModel::RowInserted( unsigned int before )
 {
     m_ordered = false;

-    
+

     unsigned int id = m_lastIndex++;
     unsigned int id = m_lastIndex++;

-    m_hash.Insert( (void*) id, before );
-    wxDataViewItem item( (void*) id );
+    m_hash.Insert( wxUIntToPtr(id), before );
+    wxDataViewItem item( wxUIntToPtr(id) );

     ItemAdded( wxDataViewItem(0), item );
 }
 
 void wxDataViewIndexListModel::RowAppended()
 {
     unsigned int id = m_lastIndex++;
     ItemAdded( wxDataViewItem(0), item );
 }
 
 void wxDataViewIndexListModel::RowAppended()
 {
     unsigned int id = m_lastIndex++;

-    m_hash.Add( (void*) id );
-    wxDataViewItem item( (void*) id );
+    m_hash.Add( wxUIntToPtr(id) );
+    wxDataViewItem item( wxUIntToPtr(id) );

     ItemAdded( wxDataViewItem(0), item );
 }
 
 void wxDataViewIndexListModel::RowDeleted( unsigned int row )
 {
     m_ordered = false;
     ItemAdded( wxDataViewItem(0), item );
 }
 
 void wxDataViewIndexListModel::RowDeleted( unsigned int row )
 {
     m_ordered = false;

-        
+

     wxDataViewItem item( m_hash[row] );
     wxDataViewModel::ItemDeleted( wxDataViewItem(0), item );
     m_hash.RemoveAt( row );
     wxDataViewItem item( m_hash[row] );
     wxDataViewModel::ItemDeleted( wxDataViewItem(0), item );
     m_hash.RemoveAt( row );


@@ -376,9 +382,9 @@ void wxDataViewIndexListModel::RowsDeleted( const wxArrayInt &rows )
 {
     wxArrayInt sorted = rows;
     sorted.Sort( my_sort );
 {
     wxArrayInt sorted = rows;
     sorted.Sort( my_sort );

-    
+

     m_ordered = false;
     m_ordered = false;

-        
+

     wxDataViewItemArray array;
     unsigned int i;
     for (i = 0; i < rows.GetCount(); i++)
     wxDataViewItemArray array;
     unsigned int i;
     for (i = 0; i < rows.GetCount(); i++)


@@ -387,7 +393,7 @@ void wxDataViewIndexListModel::RowsDeleted( const wxArrayInt &rows )
             array.Add( item );
     }
     wxDataViewModel::ItemsDeleted( wxDataViewItem(0), array );
             array.Add( item );
     }
     wxDataViewModel::ItemsDeleted( wxDataViewItem(0), array );

-        
+

     for (i = 0; i < sorted.GetCount(); i++)
            m_hash.RemoveAt( sorted[i] );
 }
     for (i = 0; i < sorted.GetCount(); i++)
            m_hash.RemoveAt( sorted[i] );
 }


@@ -409,7 +415,7 @@ unsigned int wxDataViewIndexListModel::GetRow( const wxDataViewItem &item ) cons
             unsigned int pos = wxPtrToUInt( item.GetID() );
             return pos-1;
     }
             unsigned int pos = wxPtrToUInt( item.GetID() );
             return pos-1;
     }

-    
+

     // assert for not found
     return (unsigned int) m_hash.Index( item.GetID() );
 }
     // assert for not found
     return (unsigned int) m_hash.Index( item.GetID() );
 }


@@ -421,7 +427,7 @@ wxDataViewItem wxDataViewIndexListModel::GetItem( unsigned int row ) const
 }
 
 bool wxDataViewIndexListModel::HasDefaultCompare() const
 }
 
 bool wxDataViewIndexListModel::HasDefaultCompare() const

-{ 
+{

     return !m_ordered;
 }
 
     return !m_ordered;
 }
 


@@ -434,13 +440,13 @@ int wxDataViewIndexListModel::Compare(const wxDataViewItem& item1,
     {
         unsigned int pos1 = wxPtrToUInt(item1.GetID());
         unsigned int pos2 = wxPtrToUInt(item2.GetID());
     {
         unsigned int pos1 = wxPtrToUInt(item1.GetID());
         unsigned int pos2 = wxPtrToUInt(item2.GetID());

-        
+

         if (ascending)
             return pos1 - pos2;
         if (ascending)
             return pos1 - pos2;

-        else 
+        else

             return pos2 - pos1;
     }
             return pos2 - pos1;
     }

-    
+

     if (ascending)
         return GetRow(item1) - GetRow(item2);
 
     if (ascending)
         return GetRow(item1) - GetRow(item2);
 


@@ -484,7 +490,7 @@ unsigned int wxDataViewIndexListModel::GetChildren( const wxDataViewItem &item,
         return 0;
 
     children = m_hash;
         return 0;
 
     children = m_hash;

-    
+

     return m_hash.GetCount();
 }
 
     return m_hash.GetCount();
 }
 


@@ -506,34 +512,34 @@ wxDataViewVirtualListModel::~wxDataViewVirtualListModel()
 void wxDataViewVirtualListModel::Reset( unsigned int new_size )
 {
     m_lastIndex = new_size-1;
 void wxDataViewVirtualListModel::Reset( unsigned int new_size )
 {
     m_lastIndex = new_size-1;

-    
+

     wxDataViewModel::Cleared();
 }
 
 void wxDataViewVirtualListModel::RowPrepended()
 {
     m_lastIndex++;
     wxDataViewModel::Cleared();
 }
 
 void wxDataViewVirtualListModel::RowPrepended()
 {
     m_lastIndex++;

-    wxDataViewItem item( (void*) 0 );
+    wxDataViewItem item( NULL );

     ItemAdded( wxDataViewItem(0), item );
 }
 
 void wxDataViewVirtualListModel::RowInserted( unsigned int before )
 {
     m_lastIndex++;
     ItemAdded( wxDataViewItem(0), item );
 }
 
 void wxDataViewVirtualListModel::RowInserted( unsigned int before )
 {
     m_lastIndex++;

-    wxDataViewItem item( (void*) before );
+    wxDataViewItem item( wxUIntToPtr(before) );

     ItemAdded( wxDataViewItem(0), item );
 }
 
 void wxDataViewVirtualListModel::RowAppended()
 {
     m_lastIndex++;
     ItemAdded( wxDataViewItem(0), item );
 }
 
 void wxDataViewVirtualListModel::RowAppended()
 {
     m_lastIndex++;

-    wxDataViewItem item( (void*) m_lastIndex );
+    wxDataViewItem item( wxUIntToPtr(m_lastIndex) );

     ItemAdded( wxDataViewItem(0), item );
 }
 
 void wxDataViewVirtualListModel::RowDeleted( unsigned int row )
 {
     ItemAdded( wxDataViewItem(0), item );
 }
 
 void wxDataViewVirtualListModel::RowDeleted( unsigned int row )
 {

-    wxDataViewItem item( (void*) row );
+    wxDataViewItem item( wxUIntToPtr(row) );

     wxDataViewModel::ItemDeleted( wxDataViewItem(0), item );
     m_lastIndex++;
 }
     wxDataViewModel::ItemDeleted( wxDataViewItem(0), item );
     m_lastIndex++;
 }


@@ -542,16 +548,16 @@ void wxDataViewVirtualListModel::RowsDeleted( const wxArrayInt &rows )
 {
     wxArrayInt sorted = rows;
     sorted.Sort( my_sort );
 {
     wxArrayInt sorted = rows;
     sorted.Sort( my_sort );

-    
+

     wxDataViewItemArray array;
     unsigned int i;
     for (i = 0; i < sorted.GetCount(); i++)
     {
     wxDataViewItemArray array;
     unsigned int i;
     for (i = 0; i < sorted.GetCount(); i++)
     {

-            wxDataViewItem item( (void*) sorted[i] );
+            wxDataViewItem item( wxUIntToPtr(sorted[i]) );

             array.Add( item );
     }
     wxDataViewModel::ItemsDeleted( wxDataViewItem(0), array );
             array.Add( item );
     }
     wxDataViewModel::ItemsDeleted( wxDataViewItem(0), array );

-    
+

     m_lastIndex -= rows.GetCount();
 }
 
     m_lastIndex -= rows.GetCount();
 }
 


@@ -572,11 +578,11 @@ unsigned int wxDataViewVirtualListModel::GetRow( const wxDataViewItem &item ) co
 
 wxDataViewItem wxDataViewVirtualListModel::GetItem( unsigned int row ) const
 {
 
 wxDataViewItem wxDataViewVirtualListModel::GetItem( unsigned int row ) const
 {

-    return wxDataViewItem( (void*) row  );
+    return wxDataViewItem( wxUIntToPtr(row)  );

 }
 
 bool wxDataViewVirtualListModel::HasDefaultCompare() const
 }
 
 bool wxDataViewVirtualListModel::HasDefaultCompare() const

-{ 
+{

     return true;
 }
 
     return true;
 }
 


@@ -587,10 +593,10 @@ int wxDataViewVirtualListModel::Compare(const wxDataViewItem& item1,
 {
     unsigned int pos1 = wxPtrToUInt(item1.GetID());
     unsigned int pos2 = wxPtrToUInt(item2.GetID());
 {
     unsigned int pos1 = wxPtrToUInt(item1.GetID());
     unsigned int pos2 = wxPtrToUInt(item2.GetID());

-        
+

     if (ascending)
        return pos1 - pos2;
     if (ascending)
        return pos1 - pos2;

-    else 
+    else

        return pos2 - pos1;
 }
 
        return pos2 - pos1;
 }
 


@@ -658,15 +664,30 @@ wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype,
                                                 int WXUNUSED(align) )
 {
     m_variantType = varianttype;
                                                 int WXUNUSED(align) )
 {
     m_variantType = varianttype;

-    m_editorCtrl = NULL;

     m_owner = NULL;
 }
 
     m_owner = NULL;
 }
 

+wxDataViewRendererBase::~wxDataViewRendererBase()
+{
+}
+

 const wxDataViewCtrl* wxDataViewRendererBase::GetView() const
 {
 const wxDataViewCtrl* wxDataViewRendererBase::GetView() const
 {

-    return wx_const_cast(wxDataViewRendererBase*, this)->GetOwner()->GetOwner();
+    return const_cast<wxDataViewRendererBase*>(this)->GetOwner()->GetOwner();

 }
 
 }
 

+class wxKillRef: public wxWindowRef
+{
+public:
+   wxKillRef( wxWindow *win ) : wxWindowRef( win ) { }
+   virtual void OnObjectDestroy()
+   {
+      get()->PopEventHandler( true );
+      m_pobj = NULL;
+      delete this;
+   }
+};
+

 bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect labelRect )
 {
     m_item = item; // remember for later
 bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect labelRect )
 {
     m_item = item; // remember for later


@@ -676,6 +697,7 @@ bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect la
     GetOwner()->GetOwner()->GetModel()->GetValue( value, item, col );
 
     m_editorCtrl = CreateEditorCtrl( GetOwner()->GetOwner()->GetMainWindow(), labelRect, value );
     GetOwner()->GetOwner()->GetModel()->GetValue( value, item, col );
 
     m_editorCtrl = CreateEditorCtrl( GetOwner()->GetOwner()->GetMainWindow(), labelRect, value );

+    (void) new wxKillRef( m_editorCtrl.get() );

 
     wxDataViewEditorCtrlEvtHandler *handler =
         new wxDataViewEditorCtrlEvtHandler( m_editorCtrl, (wxDataViewRenderer*) this );
 
     wxDataViewEditorCtrlEvtHandler *handler =
         new wxDataViewEditorCtrlEvtHandler( m_editorCtrl, (wxDataViewRenderer*) this );


@@ -700,22 +722,26 @@ bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect la
 
 void wxDataViewRendererBase::CancelEditing()
 {
 
 void wxDataViewRendererBase::CancelEditing()
 {

-    wxPendingDelete.Append( m_editorCtrl );
+    if (!m_editorCtrl) return;

 
     GetOwner()->GetOwner()->GetMainWindow()->SetFocus();
 
 
     GetOwner()->GetOwner()->GetMainWindow()->SetFocus();
 

-    // m_editorCtrl->PopEventHandler( true );
+    m_editorCtrl->Hide();
+    wxPendingDelete.Append( m_editorCtrl );

 }
 
 bool wxDataViewRendererBase::FinishEditing()
 {
 }
 
 bool wxDataViewRendererBase::FinishEditing()
 {

+    if (!m_editorCtrl) return true;
+

     wxVariant value;
     GetValueFromEditorCtrl( m_editorCtrl, value );
 
     wxVariant value;
     GetValueFromEditorCtrl( m_editorCtrl, value );
 

-    wxPendingDelete.Append( m_editorCtrl );
-

     GetOwner()->GetOwner()->GetMainWindow()->SetFocus();
 
     GetOwner()->GetOwner()->GetMainWindow()->SetFocus();
 

+    m_editorCtrl->Hide();
+    wxPendingDelete.Append( m_editorCtrl );
+

     if (!Validate(value))
         return false;
 
     if (!Validate(value))
         return false;
 


@@ -723,8 +749,6 @@ bool wxDataViewRendererBase::FinishEditing()
     GetOwner()->GetOwner()->GetModel()->SetValue( value, m_item, col );
     GetOwner()->GetOwner()->GetModel()->ValueChanged( m_item, col );
 
     GetOwner()->GetOwner()->GetModel()->SetValue( value, m_item, col );
     GetOwner()->GetOwner()->GetModel()->ValueChanged( m_item, col );
 

-    // m_editorCtrl->PopEventHandler( true );
-

     // Now we should send Editing Done event
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, GetOwner()->GetOwner()->GetId() );
     event.SetDataViewColumn( GetOwner() );
     // Now we should send Editing Done event
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, GetOwner()->GetOwner()->GetId() );
     event.SetDataViewColumn( GetOwner() );


@@ -743,6 +767,7 @@ BEGIN_EVENT_TABLE(wxDataViewEditorCtrlEvtHandler, wxEvtHandler)
     EVT_CHAR           (wxDataViewEditorCtrlEvtHandler::OnChar)
     EVT_KILL_FOCUS     (wxDataViewEditorCtrlEvtHandler::OnKillFocus)
     EVT_IDLE           (wxDataViewEditorCtrlEvtHandler::OnIdle)
     EVT_CHAR           (wxDataViewEditorCtrlEvtHandler::OnChar)
     EVT_KILL_FOCUS     (wxDataViewEditorCtrlEvtHandler::OnKillFocus)
     EVT_IDLE           (wxDataViewEditorCtrlEvtHandler::OnIdle)

+    EVT_TEXT_ENTER     (-1, wxDataViewEditorCtrlEvtHandler::OnTextEnter)

 END_EVENT_TABLE()
 
 wxDataViewEditorCtrlEvtHandler::wxDataViewEditorCtrlEvtHandler(
 END_EVENT_TABLE()
 
 wxDataViewEditorCtrlEvtHandler::wxDataViewEditorCtrlEvtHandler(


@@ -767,21 +792,27 @@ void wxDataViewEditorCtrlEvtHandler::OnIdle( wxIdleEvent &event )
     event.Skip();
 }
 
     event.Skip();
 }
 

+void wxDataViewEditorCtrlEvtHandler::OnTextEnter( wxCommandEvent &WXUNUSED(event) )
+{
+    m_finished = true;
+    m_owner->FinishEditing();
+}
+

 void wxDataViewEditorCtrlEvtHandler::OnChar( wxKeyEvent &event )
 {
     switch ( event.m_keyCode )
     {
         case WXK_RETURN:
 void wxDataViewEditorCtrlEvtHandler::OnChar( wxKeyEvent &event )
 {
     switch ( event.m_keyCode )
     {
         case WXK_RETURN:

-            wxPrintf( "OnChar RETURN\n" );

             m_finished = true;
             m_owner->FinishEditing();
             break;
 
         case WXK_ESCAPE:
             m_finished = true;
             m_owner->FinishEditing();
             break;
 
         case WXK_ESCAPE:

+        {

             m_finished = true;
             m_owner->CancelEditing();
             break;
             m_finished = true;
             m_owner->CancelEditing();
             break;

-
+        }

         default:
             event.Skip();
     }
         default:
             event.Skip();
     }


@@ -791,7 +822,6 @@ void wxDataViewEditorCtrlEvtHandler::OnKillFocus( wxFocusEvent &event )
 {
     if (!m_finished)
     {
 {
     if (!m_finished)
     {

-        wxPrintf( "OnKillFocus\n" );

         m_finished = true;
         m_owner->FinishEditing();
     }
         m_finished = true;
         m_owner->FinishEditing();
     }


@@ -803,64 +833,18 @@ void wxDataViewEditorCtrlEvtHandler::OnKillFocus( wxFocusEvent &event )
 // wxDataViewColumnBase
 // ---------------------------------------------------------
 
 // wxDataViewColumnBase
 // ---------------------------------------------------------
 

-IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumnBase, wxObject)
-
-wxDataViewColumnBase::wxDataViewColumnBase(const wxString& WXUNUSED(title),
-                                           wxDataViewRenderer *renderer,
-                                           unsigned int model_column,
-                                           int WXUNUSED(width),
-                                           wxAlignment WXUNUSED(align),
-                                           int WXUNUSED(flags))
-{
-    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 WXUNUSED(width),
-                                           wxAlignment WXUNUSED(align),
-                                           int WXUNUSED(flags) )
+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;

-    m_bitmap = bitmap;

     m_owner = NULL;
     m_renderer->SetOwner( (wxDataViewColumn*) this );
 }
 
 wxDataViewColumnBase::~wxDataViewColumnBase()
 {
     m_owner = NULL;
     m_renderer->SetOwner( (wxDataViewColumn*) this );
 }
 
 wxDataViewColumnBase::~wxDataViewColumnBase()
 {

-    if (m_renderer)
-        delete m_renderer;
-}
-
-int wxDataViewColumnBase::GetFlags() const
-{
-    int ret = 0;
-
-    if (IsSortable())
-        ret |= wxDATAVIEW_COL_SORTABLE;
-    if (IsResizeable())
-        ret |= wxDATAVIEW_COL_RESIZABLE;
-    if (IsHidden())
-        ret |= wxDATAVIEW_COL_HIDDEN;
-
-    return ret;
-}
-
-void wxDataViewColumnBase::SetFlags(int flags)
-{
-    SetSortable((flags & wxDATAVIEW_COL_SORTABLE) != 0);
-    SetResizeable((flags & wxDATAVIEW_COL_RESIZABLE) != 0);
-    SetHidden((flags & wxDATAVIEW_COL_HIDDEN) != 0);
-    SetReorderable((flags & wxDATAVIEW_COL_REORDERABLE) != 0);
+    delete m_renderer;

 }
 
 // ---------------------------------------------------------
 }
 
 // ---------------------------------------------------------


@@ -912,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 )


@@ -1192,6 +1200,13 @@ wxDataViewCtrlBase::PrependColumn( wxDataViewColumn *col )
     return true;
 }
 
     return true;
 }
 

+bool
+wxDataViewCtrlBase::InsertColumn( unsigned int WXUNUSED(pos), wxDataViewColumn *col )
+{
+    col->SetOwner( (wxDataViewCtrl*) this );
+    return true;
+}
+

 // ---------------------------------------------------------
 // wxDataViewEvent
 // ---------------------------------------------------------
 // ---------------------------------------------------------
 // wxDataViewEvent
 // ---------------------------------------------------------


@@ -1238,13 +1253,13 @@ wxControl* wxDataViewSpinRenderer::CreateEditorCtrl( wxWindow *parent, wxRect la
     wxString str;
     str.Printf( wxT("%d"), (int) l );
     wxSpinCtrl *sc = new wxSpinCtrl( parent, wxID_ANY, str,
     wxString str;
     str.Printf( wxT("%d"), (int) l );
     wxSpinCtrl *sc = new wxSpinCtrl( parent, wxID_ANY, str,

-               labelRect.GetTopLeft(), size, wxSP_ARROW_KEYS, m_min, m_max, l );
+               labelRect.GetTopLeft(), size, wxSP_ARROW_KEYS|wxTE_PROCESS_ENTER, m_min, m_max, l );

 #ifdef __WXMAC__
     size = sc->GetSize();
     wxPoint pt = sc->GetPosition();
     sc->SetSize( pt.x - 4, pt.y - 4, size.x, size.y );
 #endif
 #ifdef __WXMAC__
     size = sc->GetSize();
     wxPoint pt = sc->GetPosition();
     sc->SetSize( pt.x - 4, pt.y - 4, size.x, size.y );
 #endif

-    
+

     return sc;
 }
 
     return sc;
 }
 


@@ -1281,6 +1296,64 @@ bool wxDataViewSpinRenderer::GetValue( wxVariant &value ) const
     return true;
 }
 
     return true;
 }
 

+// -------------------------------------
+// wxDataViewChoiceRenderer
+// -------------------------------------
+
+#if defined(wxHAS_GENERIC_DATAVIEWCTRL) || defined(__WXMAC__)
+
+wxDataViewChoiceRenderer::wxDataViewChoiceRenderer( const wxArrayString& choices, wxDataViewCellMode mode, int alignment ) :
+   wxDataViewCustomRenderer(wxT("string"), mode, alignment )
+{
+    m_choices = choices;
+}
+
+wxControl* wxDataViewChoiceRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value )
+{
+    wxString s = value;
+    wxSize size = labelRect.GetSize();
+#ifdef __WXMAC__
+    size = wxSize( wxMax(70,labelRect.width ), -1 );
+#endif
+    wxChoice *c = new wxChoice( parent, wxID_ANY, labelRect.GetTopLeft(), size, m_choices );
+    c->SetStringSelection( value.GetString() );
+
+    return c;
+}
+
+bool wxDataViewChoiceRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVariant &value )
+{
+    wxChoice *c = (wxChoice*) editor;
+    wxString s = c->GetStringSelection();
+    value = s;
+    return true;
+}
+
+bool wxDataViewChoiceRenderer::Render( wxRect rect, wxDC *dc, int state )
+{
+    RenderText( m_data, 0, rect, dc, state );
+    return true;
+}
+
+wxSize wxDataViewChoiceRenderer::GetSize() const
+{
+    return wxSize(80,16);
+}
+
+bool wxDataViewChoiceRenderer::SetValue( const wxVariant &value )
+{
+    m_data = value.GetString();
+    return true;
+}
+
+bool wxDataViewChoiceRenderer::GetValue( wxVariant &value ) const
+{
+    value = m_data;
+    return true;
+}
+
+#endif
+

 //-----------------------------------------------------------------------------
 // wxDataViewTreeStore
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxDataViewTreeStore
 //-----------------------------------------------------------------------------


@@ -1579,7 +1652,7 @@ wxDataViewTreeStore::GetValue(wxVariant &variant,
         if (container->IsExpanded() && container->GetExpandedIcon().IsOk())
            icon = container->GetExpandedIcon();
     }
         if (container->IsExpanded() && container->GetExpandedIcon().IsOk())
            icon = container->GetExpandedIcon();
     }

-    
+

     wxDataViewIconText data( node->GetText(), icon );
 
     variant << data;
     wxDataViewIconText data( node->GetText(), icon );
 
     variant << data;


@@ -1710,15 +1783,15 @@ wxDataViewTreeCtrl::wxDataViewTreeCtrl()
 }
 
 wxDataViewTreeCtrl::wxDataViewTreeCtrl( wxWindow *parent, wxWindowID id,
 }
 
 wxDataViewTreeCtrl::wxDataViewTreeCtrl( wxWindow *parent, wxWindowID id,

-           const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator ) 
+           const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator )

 {
     m_imageList = NULL;
     Create( parent, id, pos, size, style, validator );
 {
     m_imageList = NULL;
     Create( parent, id, pos, size, style, validator );

-    
+

     wxDataViewTreeStore *store = new wxDataViewTreeStore;
     AssociateModel( store );
     store->DecRef();
     wxDataViewTreeStore *store = new wxDataViewTreeStore;
     AssociateModel( store );
     store->DecRef();

-    
+

     AppendIconTextColumn(wxString(),0,wxDATAVIEW_CELL_INERT,-1);
 }
 
     AppendIconTextColumn(wxString(),0,wxDATAVIEW_CELL_INERT,-1);
 }
 


@@ -1739,16 +1812,16 @@ void wxDataViewTreeCtrl::SetImageList( wxImageList *imagelist )
     if (m_imageList)
         delete m_imageList;
 
     if (m_imageList)
         delete m_imageList;
 

-    m_imageList = imagelist;   
+    m_imageList = imagelist;

 }
 }

-    
+

 wxDataViewItem wxDataViewTreeCtrl::AppendItem( const wxDataViewItem& parent,
         const wxString &text, int iconIndex, wxClientData *data )
 {
     wxIcon icon = wxNullIcon;
     if (m_imageList && (iconIndex != -1))
         icon = m_imageList->GetIcon( iconIndex );
 wxDataViewItem wxDataViewTreeCtrl::AppendItem( const wxDataViewItem& parent,
         const wxString &text, int iconIndex, wxClientData *data )
 {
     wxIcon icon = wxNullIcon;
     if (m_imageList && (iconIndex != -1))
         icon = m_imageList->GetIcon( iconIndex );

-        
+

     return GetStore()->AppendItem( parent, text, icon, data );
 }
 
     return GetStore()->AppendItem( parent, text, icon, data );
 }
 


@@ -1758,7 +1831,7 @@ wxDataViewItem wxDataViewTreeCtrl::PrependItem( const wxDataViewItem& parent,
     wxIcon icon = wxNullIcon;
     if (m_imageList && (iconIndex != -1))
         icon = m_imageList->GetIcon( iconIndex );
     wxIcon icon = wxNullIcon;
     if (m_imageList && (iconIndex != -1))
         icon = m_imageList->GetIcon( iconIndex );

-        
+

     return GetStore()->PrependItem( parent, text, icon, data );
 }
 
     return GetStore()->PrependItem( parent, text, icon, data );
 }
 


@@ -1768,7 +1841,7 @@ wxDataViewItem wxDataViewTreeCtrl::InsertItem( const wxDataViewItem& parent, con
     wxIcon icon = wxNullIcon;
     if (m_imageList && (iconIndex != -1))
         icon = m_imageList->GetIcon( iconIndex );
     wxIcon icon = wxNullIcon;
     if (m_imageList && (iconIndex != -1))
         icon = m_imageList->GetIcon( iconIndex );

-        
+

     return GetStore()->InsertItem( parent, previous, text, icon, data );
 }
 
     return GetStore()->InsertItem( parent, previous, text, icon, data );
 }
 


@@ -1778,11 +1851,11 @@ wxDataViewItem wxDataViewTreeCtrl::PrependContainer( const wxDataViewItem& paren
     wxIcon icon = wxNullIcon;
     if (m_imageList && (iconIndex != -1))
         icon = m_imageList->GetIcon( iconIndex );
     wxIcon icon = wxNullIcon;
     if (m_imageList && (iconIndex != -1))
         icon = m_imageList->GetIcon( iconIndex );

-        
+

     wxIcon expanded = wxNullIcon;
     if (m_imageList && (expandedIndex != -1))
         expanded = m_imageList->GetIcon( expandedIndex );
     wxIcon expanded = wxNullIcon;
     if (m_imageList && (expandedIndex != -1))
         expanded = m_imageList->GetIcon( expandedIndex );

-        
+

     return GetStore()->PrependContainer( parent, text, icon, expanded, data );
 }
 
     return GetStore()->PrependContainer( parent, text, icon, expanded, data );
 }
 


@@ -1792,11 +1865,11 @@ wxDataViewItem wxDataViewTreeCtrl::AppendContainer( const wxDataViewItem& parent
     wxIcon icon = wxNullIcon;
     if (m_imageList && (iconIndex != -1))
         icon = m_imageList->GetIcon( iconIndex );
     wxIcon icon = wxNullIcon;
     if (m_imageList && (iconIndex != -1))
         icon = m_imageList->GetIcon( iconIndex );

-        
+

     wxIcon expanded = wxNullIcon;
     if (m_imageList && (expandedIndex != -1))
         expanded = m_imageList->GetIcon( expandedIndex );
     wxIcon expanded = wxNullIcon;
     if (m_imageList && (expandedIndex != -1))
         expanded = m_imageList->GetIcon( expandedIndex );

-        
+

     return GetStore()->AppendContainer( parent, text, icon, expanded, data );
 }
 
     return GetStore()->AppendContainer( parent, text, icon, expanded, data );
 }
 


@@ -1806,21 +1879,21 @@ wxDataViewItem wxDataViewTreeCtrl::InsertContainer( const wxDataViewItem& parent
     wxIcon icon = wxNullIcon;
     if (m_imageList && (iconIndex != -1))
         icon = m_imageList->GetIcon( iconIndex );
     wxIcon icon = wxNullIcon;
     if (m_imageList && (iconIndex != -1))
         icon = m_imageList->GetIcon( iconIndex );

-        
+

     wxIcon expanded = wxNullIcon;
     if (m_imageList && (expandedIndex != -1))
         expanded = m_imageList->GetIcon( expandedIndex );
     wxIcon expanded = wxNullIcon;
     if (m_imageList && (expandedIndex != -1))
         expanded = m_imageList->GetIcon( expandedIndex );

-        
+

     return GetStore()->InsertContainer( parent, previous, text, icon, expanded, data );
 }
 
 void wxDataViewTreeCtrl::OnExpanded( wxDataViewEvent &event )
 {
     if (m_imageList) return;
     return GetStore()->InsertContainer( parent, previous, text, icon, expanded, data );
 }
 
 void wxDataViewTreeCtrl::OnExpanded( wxDataViewEvent &event )
 {
     if (m_imageList) return;

-    
+

     wxDataViewTreeStoreContainerNode* container = GetStore()->FindContainerNode( event.GetItem() );
     if (!container) return;
     wxDataViewTreeStoreContainerNode* container = GetStore()->FindContainerNode( event.GetItem() );
     if (!container) return;

-    
+

     container->SetExpanded( true );
     GetStore()->ItemChanged( event.GetItem() );
 }
     container->SetExpanded( true );
     GetStore()->ItemChanged( event.GetItem() );
 }


@@ -1828,10 +1901,10 @@ void wxDataViewTreeCtrl::OnExpanded( wxDataViewEvent &event )
 void wxDataViewTreeCtrl::OnCollapsed( wxDataViewEvent &event )
 {
     if (m_imageList) return;
 void wxDataViewTreeCtrl::OnCollapsed( wxDataViewEvent &event )
 {
     if (m_imageList) return;

-    
+

     wxDataViewTreeStoreContainerNode* container = GetStore()->FindContainerNode( event.GetItem() );
     if (!container) return;
     wxDataViewTreeStoreContainerNode* container = GetStore()->FindContainerNode( event.GetItem() );
     if (!container) return;

-    
+

     container->SetExpanded( false );
     GetStore()->ItemChanged( event.GetItem() );
 }
     container->SetExpanded( false );
     GetStore()->ItemChanged( event.GetItem() );
 }


@@ -1839,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 );
 }