X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8b6cf9bf10a43343734d1bb22f2fae3ade2f4a67..d75a69e8329cecf6f07c667ffc015186c230a2b5:/src/common/datavcmn.cpp

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index f487ba4d0c..6e67dbaa40 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -18,9 +18,10 @@
 #if wxUSE_DATAVIEWCTRL
 
 #include "wx/dataview.h"
-
 #include "wx/spinctrl.h"
 
+#include "wx/weakref.h"
+
 #ifndef WX_PRECOMP
     #include "wx/dc.h"
     #include "wx/settings.h"
@@ -40,7 +41,7 @@ bool operator == (const wxDataViewItem &left, const wxDataViewItem &right)
 #ifdef __WXDEBUG__
 void wxDataViewItem::Print(const wxString& text) const
 {
-    wxPrintf("item %s: %l\n", text, (long)m_id);
+    wxPrintf(wxT("item %s: %l\n"), text.GetData(), (long)m_id);
 }
 #endif
 
@@ -297,111 +298,79 @@ int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem
 // wxDataViewIndexListModel
 // ---------------------------------------------------------
 
-wxDataViewIndexListModel::wxDataViewIndexListModel( unsigned int initial_size )
+static int my_sort( int *v1, int *v2 )
 {
-#ifndef __WXMAC__
-    m_useHash = false;
-#else
-    m_useHash = true;
-#endif
+   return *v2-*v1;
+}
 
-    if (m_useHash)
-    {
-        // 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++)
+
+wxDataViewIndexListModel::wxDataViewIndexListModel( unsigned int initial_size )
+{
+    // 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++)
             m_hash.Add( (void*) i );
-        m_lastIndex = initial_size + 1;
-    }
-    else
-    {
-        m_lastIndex = initial_size-1;
-    }
+    m_lastIndex = initial_size + 1;
 }
 
 wxDataViewIndexListModel::~wxDataViewIndexListModel()
 {
 }
 
+void wxDataViewIndexListModel::Reset( unsigned int new_size )
+{
+    m_hash.Clear();
+    
+    // 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++)
+            m_hash.Add( (void*) i );
+    m_lastIndex = new_size + 1;
+    
+    wxDataViewModel::Cleared();
+}
+
 void wxDataViewIndexListModel::RowPrepended()
 {
-    if (m_useHash)
-    {
-        m_ordered = false;
+    m_ordered = false;
     
-        unsigned int id = m_lastIndex++;
-        m_hash.Insert( (void*) id, 0 );
-        wxDataViewItem item( (void*) id );
-        ItemAdded( wxDataViewItem(0), item );
-    }
-    else
-    {
-        m_lastIndex++;
-        wxDataViewItem item( (void*) 0 );
-        ItemAdded( wxDataViewItem(0), item );
-    }
+    unsigned int id = m_lastIndex++;
+    m_hash.Insert( (void*) id, 0 );
+    wxDataViewItem item( (void*) id );
+    ItemAdded( wxDataViewItem(0), item );
 }
 
 void wxDataViewIndexListModel::RowInserted( unsigned int before )
 {
-    if (m_useHash)
-    {
-        m_ordered = false;
+    m_ordered = false;
     
-        unsigned int id = m_lastIndex++;
-        m_hash.Insert( (void*) id, before );
-        wxDataViewItem item( (void*) id );
-        ItemAdded( wxDataViewItem(0), item );
-    }
-    else
-    {
-        m_lastIndex++;
-        wxDataViewItem item( (void*) before );
-        ItemAdded( wxDataViewItem(0), item );
-    }
+    unsigned int id = m_lastIndex++;
+    m_hash.Insert( (void*) id, before );
+    wxDataViewItem item( (void*) id );
+    ItemAdded( wxDataViewItem(0), item );
 }
 
 void wxDataViewIndexListModel::RowAppended()
 {
-    if (m_useHash)
-    {
-        unsigned int id = m_lastIndex++;
-        m_hash.Add( (void*) id );
-        wxDataViewItem item( (void*) id );
-        ItemAdded( wxDataViewItem(0), item );
-    }
-    else
-    {
-        m_lastIndex++;
-        wxDataViewItem item( (void*) m_lastIndex );
-        ItemAdded( wxDataViewItem(0), item );
-    }
+    unsigned int id = m_lastIndex++;
+    m_hash.Add( (void*) id );
+    wxDataViewItem item( (void*) id );
+    ItemAdded( wxDataViewItem(0), item );
 }
 
 void wxDataViewIndexListModel::RowDeleted( unsigned int row )
 {
-    if (m_useHash)
-    {
-        m_ordered = false;
+    m_ordered = false;
         
-        wxDataViewItem item( m_hash[row] );
-        wxDataViewModel::ItemDeleted( wxDataViewItem(0), item );
-        m_hash.RemoveAt( row );
-    }
-    else
-    {
-        wxDataViewItem item( (void*) row );
-        wxDataViewModel::ItemDeleted( wxDataViewItem(0), item );
-        m_lastIndex++;
-    }
-}
-
-static int my_sort( int *v1, int *v2 )
-{
-   return *v2-*v1;
+    wxDataViewItem item( m_hash[row] );
+    wxDataViewModel::ItemDeleted( wxDataViewItem(0), item );
+    m_hash.RemoveAt( row );
 }
 
 void wxDataViewIndexListModel::RowsDeleted( const wxArrayInt &rows )
@@ -409,35 +378,19 @@ void wxDataViewIndexListModel::RowsDeleted( const wxArrayInt &rows )
     wxArrayInt sorted = rows;
     sorted.Sort( my_sort );
     
-    if (m_useHash)
-    {
-        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++)
+    {
             wxDataViewItem item( m_hash[rows[i]] );
             array.Add( item );
-        }
-        wxDataViewModel::ItemsDeleted( wxDataViewItem(0), array );
+    }
+    wxDataViewModel::ItemsDeleted( wxDataViewItem(0), array );
         
-        for (i = 0; i < sorted.GetCount(); i++)
+    for (i = 0; i < sorted.GetCount(); i++)
            m_hash.RemoveAt( sorted[i] );
-    }
-    else
-    {
-        wxDataViewItemArray array;
-        unsigned int i;
-        for (i = 0; i < sorted.GetCount(); i++)
-        {
-            wxDataViewItem item( (void*) sorted[i] );
-            array.Add( item );
-        }
-        wxDataViewModel::ItemsDeleted( wxDataViewItem(0), array );
-    
-        m_lastIndex -= rows.GetCount();
-    }
 }
 
 void wxDataViewIndexListModel::RowChanged( unsigned int row )
@@ -452,34 +405,20 @@ void wxDataViewIndexListModel::RowValueChanged( unsigned int row, unsigned int c
 
 unsigned int wxDataViewIndexListModel::GetRow( const wxDataViewItem &item ) const
 {
-    if (m_useHash)
+    if (m_ordered)
     {
-        if (m_ordered)
-        {
             unsigned int pos = wxPtrToUInt( item.GetID() );
             return pos-1;
-        }
-    
-        // assert for not found
-        return (unsigned int) m_hash.Index( item.GetID() );
-    }
-    else
-    {
-        return wxPtrToUInt( item.GetID() );
     }
+    
+    // assert for not found
+    return (unsigned int) m_hash.Index( item.GetID() );
 }
 
 wxDataViewItem wxDataViewIndexListModel::GetItem( unsigned int row ) const
 {
-    if (m_useHash)
-    {
-        wxASSERT( row < m_hash.GetCount() );
-        return wxDataViewItem( m_hash[row] );
-    }
-    else
-    {
-        return wxDataViewItem( (void*) row  );
-    }
+    wxASSERT( row < m_hash.GetCount() );
+    return wxDataViewItem( m_hash[row] );
 }
 
 bool wxDataViewIndexListModel::HasDefaultCompare() const
@@ -492,7 +431,7 @@ int wxDataViewIndexListModel::Compare(const wxDataViewItem& item1,
                                       unsigned int WXUNUSED(column),
                                       bool ascending)
 {
-    if (m_ordered || !m_useHash)
+    if (m_ordered)
     {
         unsigned int pos1 = wxPtrToUInt(item1.GetID());
         unsigned int pos2 = wxPtrToUInt(item2.GetID());
@@ -542,17 +481,158 @@ bool wxDataViewIndexListModel::IsContainer( const wxDataViewItem &item ) const
 
 unsigned int wxDataViewIndexListModel::GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const
 {
-    if (!m_useHash)
-        return 0;  // error
-        
     if (item.IsOk())
         return 0;
 
     children = m_hash;
-
+    
     return m_hash.GetCount();
 }
 
+// ---------------------------------------------------------
+// wxDataViewVirtualListModel
+// ---------------------------------------------------------
+
+#ifndef __WXMAC__
+
+wxDataViewVirtualListModel::wxDataViewVirtualListModel( unsigned int initial_size )
+{
+    m_lastIndex = initial_size-1;
+}
+
+wxDataViewVirtualListModel::~wxDataViewVirtualListModel()
+{
+}
+
+void wxDataViewVirtualListModel::Reset( unsigned int new_size )
+{
+    m_lastIndex = new_size-1;
+    
+    wxDataViewModel::Cleared();
+}
+
+void wxDataViewVirtualListModel::RowPrepended()
+{
+    m_lastIndex++;
+    wxDataViewItem item( (void*) 0 );
+    ItemAdded( wxDataViewItem(0), item );
+}
+
+void wxDataViewVirtualListModel::RowInserted( unsigned int before )
+{
+    m_lastIndex++;
+    wxDataViewItem item( (void*) before );
+    ItemAdded( wxDataViewItem(0), item );
+}
+
+void wxDataViewVirtualListModel::RowAppended()
+{
+    m_lastIndex++;
+    wxDataViewItem item( (void*) m_lastIndex );
+    ItemAdded( wxDataViewItem(0), item );
+}
+
+void wxDataViewVirtualListModel::RowDeleted( unsigned int row )
+{
+    wxDataViewItem item( (void*) row );
+    wxDataViewModel::ItemDeleted( wxDataViewItem(0), item );
+    m_lastIndex++;
+}
+
+void wxDataViewVirtualListModel::RowsDeleted( const wxArrayInt &rows )
+{
+    wxArrayInt sorted = rows;
+    sorted.Sort( my_sort );
+    
+    wxDataViewItemArray array;
+    unsigned int i;
+    for (i = 0; i < sorted.GetCount(); i++)
+    {
+            wxDataViewItem item( (void*) sorted[i] );
+            array.Add( item );
+    }
+    wxDataViewModel::ItemsDeleted( wxDataViewItem(0), array );
+    
+    m_lastIndex -= rows.GetCount();
+}
+
+void wxDataViewVirtualListModel::RowChanged( unsigned int row )
+{
+    wxDataViewModel::ItemChanged( GetItem(row) );
+}
+
+void wxDataViewVirtualListModel::RowValueChanged( unsigned int row, unsigned int col )
+{
+    wxDataViewModel::ValueChanged( GetItem(row), col );
+}
+
+unsigned int wxDataViewVirtualListModel::GetRow( const wxDataViewItem &item ) const
+{
+    return wxPtrToUInt( item.GetID() );
+}
+
+wxDataViewItem wxDataViewVirtualListModel::GetItem( unsigned int row ) const
+{
+    return wxDataViewItem( (void*) row  );
+}
+
+bool wxDataViewVirtualListModel::HasDefaultCompare() const
+{ 
+    return true;
+}
+
+int wxDataViewVirtualListModel::Compare(const wxDataViewItem& item1,
+                                      const wxDataViewItem& item2,
+                                      unsigned int WXUNUSED(column),
+                                      bool ascending)
+{
+    unsigned int pos1 = wxPtrToUInt(item1.GetID());
+    unsigned int pos2 = wxPtrToUInt(item2.GetID());
+        
+    if (ascending)
+       return pos1 - pos2;
+    else 
+       return pos2 - pos1;
+}
+
+void wxDataViewVirtualListModel::GetValue( wxVariant &variant,
+                           const wxDataViewItem &item, unsigned int col ) const
+{
+    GetValue( variant, GetRow(item), col );
+}
+
+bool wxDataViewVirtualListModel::SetValue( const wxVariant &variant,
+                           const wxDataViewItem &item, unsigned int col )
+{
+    return SetValue( variant, GetRow(item), col );
+}
+
+bool wxDataViewVirtualListModel::GetAttr( const wxDataViewItem &item, unsigned int col, wxDataViewItemAttr &attr )
+{
+    return GetAttr( GetRow(item), col, attr );
+}
+
+wxDataViewItem wxDataViewVirtualListModel::GetParent( const wxDataViewItem & WXUNUSED(item) ) const
+{
+    return wxDataViewItem(0);
+}
+
+bool wxDataViewVirtualListModel::IsContainer( const wxDataViewItem &item ) const
+{
+    // only the invisible root item has children
+    if (!item.IsOk())
+        return true;
+
+    return false;
+}
+
+unsigned int wxDataViewVirtualListModel::GetChildren( const wxDataViewItem &WXUNUSED(item), wxDataViewItemArray &WXUNUSED(children) ) const
+{
+    return 0;  // should we report an error ?
+}
+
+#endif  // __WXMAC__
+
 //-----------------------------------------------------------------------------
 // wxDataViewIconText
 //-----------------------------------------------------------------------------
@@ -579,7 +659,11 @@ wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype,
                                                 int WXUNUSED(align) )
 {
     m_variantType = varianttype;
-    m_editorCtrl = NULL;
+    m_owner = NULL;
+}
+
+wxDataViewRendererBase::~wxDataViewRendererBase()
+{
 }
 
 const wxDataViewCtrl* wxDataViewRendererBase::GetView() const
@@ -587,6 +671,18 @@ const wxDataViewCtrl* wxDataViewRendererBase::GetView() const
     return wx_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
@@ -596,6 +692,7 @@ bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect la
     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 );
@@ -620,11 +717,10 @@ bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect la
 
 void wxDataViewRendererBase::CancelEditing()
 {
-    wxPendingDelete.Append( m_editorCtrl );
-
     GetOwner()->GetOwner()->GetMainWindow()->SetFocus();
-
-    // m_editorCtrl->PopEventHandler( true );
+    
+    m_editorCtrl->Hide();
+    wxPendingDelete.Append( m_editorCtrl );
 }
 
 bool wxDataViewRendererBase::FinishEditing()
@@ -632,10 +728,11 @@ bool wxDataViewRendererBase::FinishEditing()
     wxVariant value;
     GetValueFromEditorCtrl( m_editorCtrl, value );
 
-    wxPendingDelete.Append( m_editorCtrl );
-
     GetOwner()->GetOwner()->GetMainWindow()->SetFocus();
 
+    m_editorCtrl->Hide();
+    wxPendingDelete.Append( m_editorCtrl );
+    
     if (!Validate(value))
         return false;
 
@@ -643,8 +740,6 @@ bool wxDataViewRendererBase::FinishEditing()
     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() );
@@ -778,6 +873,7 @@ 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);
 }
 
 // ---------------------------------------------------------
@@ -834,7 +930,7 @@ wxDataViewCtrlBase::AppendTextColumn( const wxString &label, unsigned int model_
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewTextRenderer( wxT("string"), mode, (int)align ),
+        new wxDataViewTextRenderer( wxT("string"), mode ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -845,7 +941,7 @@ wxDataViewCtrlBase::AppendIconTextColumn( const wxString &label, unsigned int mo
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode, (int)align ),
+        new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -857,7 +953,7 @@ wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, unsigned int mode
 {
 
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ),
+        new wxDataViewToggleRenderer( wxT("bool"), mode ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -868,7 +964,7 @@ wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, unsigned int mo
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ),
+        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -879,7 +975,7 @@ wxDataViewCtrlBase::AppendDateColumn( const wxString &label, unsigned int model_
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ),
+        new wxDataViewDateRenderer( wxT("datetime"), mode ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -890,7 +986,7 @@ wxDataViewCtrlBase::AppendBitmapColumn( const wxString &label, unsigned int mode
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ),
+        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -901,7 +997,7 @@ wxDataViewCtrlBase::AppendTextColumn( const wxBitmap &label, unsigned int model_
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewTextRenderer( wxT("string"), mode, (int)align ),
+        new wxDataViewTextRenderer( wxT("string"), mode ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -912,7 +1008,7 @@ wxDataViewCtrlBase::AppendIconTextColumn( const wxBitmap &label, unsigned int mo
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode, (int)align ),
+        new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -923,7 +1019,7 @@ wxDataViewCtrlBase::AppendToggleColumn( const wxBitmap &label, unsigned int mode
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ),
+        new wxDataViewToggleRenderer( wxT("bool"), mode ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -934,7 +1030,7 @@ wxDataViewCtrlBase::AppendProgressColumn( const wxBitmap &label, unsigned int mo
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ),
+        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -945,7 +1041,7 @@ wxDataViewCtrlBase::AppendDateColumn( const wxBitmap &label, unsigned int model_
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ),
+        new wxDataViewDateRenderer( wxT("datetime"), mode ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -956,7 +1052,7 @@ wxDataViewCtrlBase::AppendBitmapColumn( const wxBitmap &label, unsigned int mode
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ),
+        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -967,7 +1063,7 @@ wxDataViewCtrlBase::PrependTextColumn( const wxString &label, unsigned int model
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewTextRenderer( wxT("string"), mode, (int)align ),
+        new wxDataViewTextRenderer( wxT("string"), mode ),
         model_column, width, align, flags );
     PrependColumn( ret );
     return ret;
@@ -978,7 +1074,7 @@ wxDataViewCtrlBase::PrependIconTextColumn( const wxString &label, unsigned int m
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode, (int)align ),
+        new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode ),
         model_column, width, align, flags );
     PrependColumn( ret );
     return ret;
@@ -990,7 +1086,7 @@ wxDataViewCtrlBase::PrependToggleColumn( const wxString &label, unsigned int mod
 {
 
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ),
+        new wxDataViewToggleRenderer( wxT("bool"), mode ),
         model_column, width, align, flags );
     PrependColumn( ret );
     return ret;
@@ -1001,7 +1097,7 @@ wxDataViewCtrlBase::PrependProgressColumn( const wxString &label, unsigned int m
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ),
+        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ),
         model_column, width, align, flags );
     PrependColumn( ret );
     return ret;
@@ -1012,7 +1108,7 @@ wxDataViewCtrlBase::PrependDateColumn( const wxString &label, unsigned int model
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ),
+        new wxDataViewDateRenderer( wxT("datetime"), mode ),
         model_column, width, align, flags );
     PrependColumn( ret );
     return ret;
@@ -1023,7 +1119,7 @@ wxDataViewCtrlBase::PrependBitmapColumn( const wxString &label, unsigned int mod
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ),
+        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ),
         model_column, width, align, flags );
     PrependColumn( ret );
     return ret;
@@ -1034,7 +1130,7 @@ wxDataViewCtrlBase::PrependTextColumn( const wxBitmap &label, unsigned int model
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewTextRenderer( wxT("string"), mode, (int)align ),
+        new wxDataViewTextRenderer( wxT("string"), mode ),
         model_column, width, align, flags );
     PrependColumn( ret );
     return ret;
@@ -1045,7 +1141,7 @@ wxDataViewCtrlBase::PrependIconTextColumn( const wxBitmap &label, unsigned int m
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode, (int)align ),
+        new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode ),
         model_column, width, align, flags );
     PrependColumn( ret );
     return ret;
@@ -1056,7 +1152,7 @@ wxDataViewCtrlBase::PrependToggleColumn( const wxBitmap &label, unsigned int mod
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ),
+        new wxDataViewToggleRenderer( wxT("bool"), mode ),
         model_column, width, align, flags );
     PrependColumn( ret );
     return ret;
@@ -1067,7 +1163,7 @@ wxDataViewCtrlBase::PrependProgressColumn( const wxBitmap &label, unsigned int m
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ),
+        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ),
         model_column, width, align, flags );
     PrependColumn( ret );
     return ret;
@@ -1078,7 +1174,7 @@ wxDataViewCtrlBase::PrependDateColumn( const wxBitmap &label, unsigned int model
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ),
+        new wxDataViewDateRenderer( wxT("datetime"), mode ),
         model_column, width, align, flags );
     PrependColumn( ret );
     return ret;
@@ -1089,7 +1185,7 @@ wxDataViewCtrlBase::PrependBitmapColumn( const wxBitmap &label, unsigned int mod
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ),
+        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ),
         model_column, width, align, flags );
     PrependColumn( ret );
     return ret;
@@ -1131,6 +1227,7 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_REORDERED)
 
 
 // -------------------------------------
@@ -1138,7 +1235,7 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED)
 // -------------------------------------
 
 wxDataViewSpinRenderer::wxDataViewSpinRenderer( int min, int max, wxDataViewCellMode mode, int alignment ) :
-   wxDataViewCustomRenderer( "long", mode, alignment )
+   wxDataViewCustomRenderer(wxT("long"), mode, alignment )
 {
     m_min = min;
     m_max = max;
@@ -1147,8 +1244,21 @@ wxDataViewSpinRenderer::wxDataViewSpinRenderer( int min, int max, wxDataViewCell
 wxControl* wxDataViewSpinRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value )
 {
     long l = value;
-    return new wxSpinCtrl( parent, wxID_ANY, wxEmptyString,
-               labelRect.GetTopLeft(), labelRect.GetSize(), wxSP_ARROW_KEYS, m_min, m_max, l );
+    wxSize size = labelRect.GetSize();
+#ifdef __WXMAC__
+    size = wxSize( wxMax(70,labelRect.width ), -1 );
+#endif
+    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 );
+#ifdef __WXMAC__
+    size = sc->GetSize();
+    wxPoint pt = sc->GetPosition();
+    sc->SetSize( pt.x - 4, pt.y - 4, size.x, size.y );
+#endif
+    
+    return sc;
 }
 
 bool wxDataViewSpinRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVariant &value )
@@ -1162,7 +1272,7 @@ bool wxDataViewSpinRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVarian
 bool wxDataViewSpinRenderer::Render( wxRect rect, wxDC *dc, int state )
 {
     wxString str;
-    str.Printf( "%d", (int) m_data );
+    str.Printf(wxT("%d"), (int) m_data );
     RenderText( str, 0, rect, dc, state );
     return true;
 }
@@ -1622,14 +1732,7 @@ wxDataViewTreeCtrl::wxDataViewTreeCtrl( wxWindow *parent, wxWindowID id,
     AssociateModel( store );
     store->DecRef();
     
-#if !defined(__WXGTK20__) || defined(wxUSE_GENERICDATAVIEWCTRL)
-    wxDataViewColumn *col = AppendIconTextColumn( "", 0, wxDATAVIEW_CELL_INERT, 40 );
-    
-    wxSize cient_size = GetClientSize();
-    col->SetWidth( size.x );
-#else
-    AppendIconTextColumn( "", 0, wxDATAVIEW_CELL_INERT, 40 );
-#endif    
+    AppendIconTextColumn(wxString(),0,wxDATAVIEW_CELL_INERT,-1);
 }
 
 wxDataViewTreeCtrl::~wxDataViewTreeCtrl()
@@ -1748,10 +1851,11 @@ void wxDataViewTreeCtrl::OnCollapsed( wxDataViewEvent &event )
 
 void wxDataViewTreeCtrl::OnSize( wxSizeEvent &event )
 {
-#if !defined(__WXGTK20__) || defined(wxUSE_GENERICDATAVIEWCTRL)
+#if defined(wxUSE_GENERICDATAVIEWCTRL)
     wxSize size = GetClientSize();
     wxDataViewColumn *col = GetColumn( 0 );
-    if (col) col->SetWidth( size.x );
+    if (col) 
+       col->SetWidth( size.x );
 #endif
     event.Skip( true );
 }