X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f554a14b8989125033f32fd9bfc4ef877664eb39..6d7b547184bfdcdf67790755deb0122050b1d728:/src/common/datavcmn.cpp

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 56966186a5..106bf563f8 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -17,13 +17,13 @@
 
 #if wxUSE_DATAVIEWCTRL
 
+#include "wx/dataview.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/object.h"
     #include "wx/log.h"
 #endif
 
-#include "wx/image.h"
-#include "wx/dataview.h"
+const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl");
 
 // ---------------------------------------------------------
 // wxDataViewModel
@@ -51,7 +51,7 @@ bool wxDataViewListModel::RowAppended()
 {
     bool ret = true;
 
-    wxNode *node = m_notifiers.GetFirst();
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();
     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
@@ -67,7 +67,7 @@ bool wxDataViewListModel::RowPrepended()
 {
     bool ret = true;
 
-    wxNode *node = m_notifiers.GetFirst();
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();
     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
@@ -83,7 +83,7 @@ bool wxDataViewListModel::RowInserted( size_t before )
 {
     bool ret = true;
 
-    wxNode *node = m_notifiers.GetFirst();
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();
     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
@@ -99,7 +99,7 @@ bool wxDataViewListModel::RowDeleted( size_t row )
 {
     bool ret = true;
 
-    wxNode *node = m_notifiers.GetFirst();
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();
     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
@@ -115,7 +115,7 @@ bool wxDataViewListModel::RowChanged( size_t row )
 {
     bool ret = true;
 
-    wxNode *node = m_notifiers.GetFirst();
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();
     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
@@ -131,7 +131,7 @@ bool wxDataViewListModel::ValueChanged( size_t col, size_t row )
 {
     bool ret = true;
 
-    wxNode *node = m_notifiers.GetFirst();
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();
     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
@@ -147,7 +147,7 @@ bool wxDataViewListModel::RowsReordered( size_t *new_order )
 {
     bool ret = true;
 
-    wxNode *node = m_notifiers.GetFirst();
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();
     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
@@ -163,7 +163,7 @@ bool wxDataViewListModel::Cleared()
 {
     bool ret = true;
 
-    wxNode *node = m_notifiers.GetFirst();
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();
     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
@@ -182,7 +182,7 @@ void wxDataViewListModel::AddViewingColumn( wxDataViewColumn *view_column, size_
 
 void wxDataViewListModel::RemoveViewingColumn( wxDataViewColumn *column )
 {
-    wxNode *node = m_viewingColumns.GetFirst();
+    wxList::compatibility_iterator node = m_viewingColumns.GetFirst();
     while (node)
     {
         wxDataViewViewingColumn* tmp = (wxDataViewViewingColumn*) node->GetData();
@@ -515,7 +515,12 @@ wxDataViewCellBase::wxDataViewCellBase( const wxString &varianttype, wxDataViewC
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumnBase, wxObject)
 
-wxDataViewColumnBase::wxDataViewColumnBase( const wxString &title, wxDataViewCell *cell, size_t model_column, int flags)
+wxDataViewColumnBase::wxDataViewColumnBase(const wxString& title,
+                                           wxDataViewCell *cell,
+                                           size_t model_column,
+                                           int WXUNUSED(fixed_width),
+                                           wxDataViewColumnSizing WXUNUSED(sizing),
+                                           int flags )
 {
     m_cell = cell;
     m_model_column = model_column;
@@ -581,12 +586,12 @@ bool wxDataViewCtrlBase::AppendTextColumn( const wxString &label, size_t model_c
 
 bool wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, size_t model_column )
 {
-    return AppendColumn( new wxDataViewColumn( label, new wxDataViewToggleCell(), model_column ) );
+    return AppendColumn( new wxDataViewColumn( label, new wxDataViewToggleCell(), model_column, 30 ) );
 }
 
 bool wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, size_t model_column )
 {
-    return AppendColumn( new wxDataViewColumn( label, new wxDataViewProgressCell(), model_column ) );
+    return AppendColumn( new wxDataViewColumn( label, new wxDataViewProgressCell(), model_column, 70 ) );
 }
 
 bool wxDataViewCtrlBase::AppendDateColumn( const wxString &label, size_t model_column )