Change wxVariant GetValue() to GetValue( wxVariant & ).

  More cool sorting code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 5d5544922823583f583ac10032a783d1e0e1ffa4..331c79259b449c50a7106ed8201811d6815e27d8 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -106,7 +106,7 @@ public:
     // return type as reported by wxVariant
     virtual wxString GetColType( size_t col ) = 0;
     // get value into a wxVariant
     // return type as reported by wxVariant
     virtual wxString GetColType( size_t col ) = 0;
     // get value into a wxVariant

-    virtual wxVariant GetValue( size_t col, size_t row ) = 0;
+    virtual void GetValue( wxVariant &variant, size_t col, size_t row ) = 0;

     // set value, call ValueChanged() afterwards!
     virtual bool SetValue( wxVariant &variant, size_t col, size_t row ) = 0;
 
     // set value, call ValueChanged() afterwards!
     virtual bool SetValue( wxVariant &variant, size_t col, size_t row ) = 0;
 


@@ -154,7 +154,7 @@ public:
     // return type as reported by wxVariant
     virtual wxString GetColType( size_t col );
     // get value into a wxVariant
     // return type as reported by wxVariant
     virtual wxString GetColType( size_t col );
     // get value into a wxVariant

-    virtual wxVariant GetValue( size_t col, size_t row );
+    virtual void GetValue( wxVariant &variant, size_t col, size_t row );

     // set value, call ValueChanged() afterwards!
     virtual bool SetValue( wxVariant &variant, size_t col, size_t row );
 
     // set value, call ValueChanged() afterwards!
     virtual bool SetValue( wxVariant &variant, size_t col, size_t row );
 

diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp
index a58827d5de085862ab68a9df3d4843517b1aa2b8..f19731e5bcf503a526ca7ea3ca4369738e95cfd1 100644 (file)
--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@@ -75,33 +75,33 @@ public:
             return wxT("string"); 
         }
         
             return wxT("string"); 
         }
         

-    virtual wxVariant GetValue( size_t col, size_t row )
+    virtual void GetValue( wxVariant &variant, size_t col, size_t row )

         {
             if (col == 6)
             {
         {
             if (col == 6)
             {

-                return (wxDateTime) *m_dates[row];
+                variant = (wxDateTime) *m_dates[row];

             } else
             if (col == 5)
             {
             } else
             if (col == 5)
             {

-                return (long) m_progress[row];
+                variant = (long) m_progress[row];

             } else
             if (col == 4)
             {
             } else
             if (col == 4)
             {

-                return m_colours[row];
+                variant = m_colours[row];

             } else
             if (col == 3)
             {
             } else
             if (col == 3)
             {

-                return (bool) m_bools[row];
+                variant = (bool) m_bools[row];

             } else 
             if (col == 2)
             {
             } else 
             if (col == 2)
             {

-                return m_list[row];
+                variant = m_list[row];

             }
             else
             {
                 wxString tmp; 
                 tmp.Printf( wxT("item(%d;%d)"), (int)row, (int)col ); 
             }
             else
             {
                 wxString tmp; 
                 tmp.Printf( wxT("item(%d;%d)"), (int)row, (int)col ); 

-                return tmp;
+                variant = tmp;

             }
         }
     virtual bool SetValue( wxVariant &value, size_t col, size_t row )
             }
         }
     virtual bool SetValue( wxVariant &value, size_t col, size_t row )


@@ -192,13 +192,16 @@ public:
     virtual size_t GetNumberOfRows() { return m_list.GetCount(); }
     virtual size_t GetNumberOfCols() { return 2; }
     virtual wxString GetColType( size_t col ) { return wxT("string"); }
     virtual size_t GetNumberOfRows() { return m_list.GetCount(); }
     virtual size_t GetNumberOfCols() { return 2; }
     virtual wxString GetColType( size_t col ) { return wxT("string"); }

-    virtual wxVariant GetValue( size_t col, size_t row )
+    virtual void GetValue( wxVariant &variant, size_t col, size_t row )

     {
         if (col == 0)
     {
         if (col == 0)

-            return m_list[row];
+        {
+            variant = m_list[row];
+            return;
+        }

         wxString tmp;
         tmp.Printf( wxT("item(%d;%d)"), (int)row, (int)col ); 
         wxString tmp;
         tmp.Printf( wxT("item(%d;%d)"), (int)row, (int)col ); 

-        return tmp;
+        variant = tmp;

     }
     virtual bool SetValue( wxVariant &variant, size_t col, size_t row )
     {
     }
     virtual bool SetValue( wxVariant &variant, size_t col, size_t row )
     {

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index ec05414d7e3d9227d2ca5732083023037f34be65..268856c151a635c6c98176aa8e11b1573a6ce4d5 100644 (file)
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -237,8 +237,9 @@ public:
 int wxCALLBACK wxDataViewListModelSortedDefaultCompare
       (size_t row1, size_t row2, size_t col, wxDataViewListModel* model )
 {
 int wxCALLBACK wxDataViewListModelSortedDefaultCompare
       (size_t row1, size_t row2, size_t col, wxDataViewListModel* model )
 {

-    wxVariant value1 = model->GetValue( col, row1 );
-    wxVariant value2 = model->GetValue( col, row2 );
+    wxVariant value1,value2;
+    model->GetValue( value1, col, row1 );
+    model->GetValue( value2, col, row2 );

     if (value1.GetType() == wxT("string"))
     {
         wxString str1 = value1.GetString();
     if (value1.GetType() == wxT("string"))
     {
         wxString str1 = value1.GetString();


@@ -314,6 +315,22 @@ void wxDataViewSortedListModel::Resort()
         m_array.Add( i );
 }
 
         m_array.Add( i );
 }
 

+#if 0
+static void Dump( wxDataViewListModel *model, size_t col )
+{
+    size_t n = model->GetNumberOfRows();
+    size_t i;
+    for (i = 0; i < n; i++)
+    {
+        wxVariant variant;
+        model->GetValue( variant, col, i );
+        wxString tmp;
+        tmp = variant.GetString();
+        wxPrintf( wxT("%d: %s\n"), (int) i, tmp.c_str() );
+    }
+}
+#endif
+

 bool wxDataViewSortedListModel::ChildValueChanged( size_t col, size_t row )
 {
     size_t i;
 bool wxDataViewSortedListModel::ChildValueChanged( size_t col, size_t row )
 {
     size_t i;


@@ -328,15 +345,16 @@ bool wxDataViewSortedListModel::ChildValueChanged( size_t col, size_t row )
             start_pos = i;
             break;
         }
             start_pos = i;
             break;
         }

-    m_array.Remove( row );
+    m_array.RemoveAt( start_pos );

     m_array.Add( row );
     m_array.Add( row );

+    

     for (i = 0; i < len; i++)
         if (m_array[i] == row)
         {
             end_pos = i;
             break;
         }
     for (i = 0; i < len; i++)
         if (m_array[i] == row)
         {
             end_pos = i;
             break;
         }

-        
+    

     if (end_pos == start_pos)
         return wxDataViewListModel::ValueChanged( col, start_pos );
     
     if (end_pos == start_pos)
         return wxDataViewListModel::ValueChanged( col, start_pos );
     


@@ -360,7 +378,7 @@ bool wxDataViewSortedListModel::ChildValueChanged( size_t col, size_t row )
         order[start_pos] = end_pos;
     }   
     
         order[start_pos] = end_pos;
     }   
     

-    RowsReordered( order );
+    wxDataViewListModel::RowsReordered( order );

     
     delete [] order;
     
     
     delete [] order;
     


@@ -369,7 +387,7 @@ bool wxDataViewSortedListModel::ChildValueChanged( size_t col, size_t row )
 
 size_t wxDataViewSortedListModel::GetNumberOfRows()
 {
 
 size_t wxDataViewSortedListModel::GetNumberOfRows()
 {

-    return m_child->GetNumberOfRows();
+    return m_array.GetCount();

 }
 
 size_t wxDataViewSortedListModel::GetNumberOfCols()
 }
 
 size_t wxDataViewSortedListModel::GetNumberOfCols()


@@ -382,10 +400,10 @@ wxString wxDataViewSortedListModel::GetColType( size_t col )
     return m_child->GetColType( col );
 }
 
     return m_child->GetColType( col );
 }
 

-wxVariant wxDataViewSortedListModel::GetValue( size_t col, size_t row )
+void wxDataViewSortedListModel::GetValue( wxVariant &variant, size_t col, size_t row )

 {
     size_t child_row = m_array[row];
 {
     size_t child_row = m_array[row];

-    return m_child->GetValue( col, child_row );
+    m_child->GetValue( variant, col, child_row );

 }
 
 bool wxDataViewSortedListModel::SetValue( wxVariant &variant, size_t col, size_t row )
 }
 
 bool wxDataViewSortedListModel::SetValue( wxVariant &variant, size_t col, size_t row )

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 6de67bf4933855ddfc150adc68b9718dcf113213..49f1ea2c97da0a0f38cf15e127d1c00434d947e2 100644 (file)
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -20,6 +20,7 @@
 #include "wx/calctrl.h"
 #include "wx/popupwin.h"
 #include "wx/sizer.h"
 #include "wx/calctrl.h"
 #include "wx/popupwin.h"
 #include "wx/sizer.h"

+#include "wx/log.h"

 
 #include "wx/gtk/private.h"
 #include "wx/gtk/win_gtk.h"
 
 #include "wx/gtk/private.h"
 #include "wx/gtk/win_gtk.h"


@@ -304,8 +305,9 @@ wxgtk_list_store_get_value (GtkTreeModel *tree_model,
     wxString mtype = model->GetColType( (size_t) column );
     if (mtype == wxT("string"))
     {
     wxString mtype = model->GetColType( (size_t) column );
     if (mtype == wxT("string"))
     {

+        wxVariant variant;

         g_value_init( value, G_TYPE_STRING );
         g_value_init( value, G_TYPE_STRING );

-        wxVariant variant = model->GetValue( (size_t) column, (size_t) iter->user_data );
+        model->GetValue( variant, (size_t) column, (size_t) iter->user_data );

         g_value_set_string( value, wxGTK_CONV(variant.GetString()) );
     }
     else
         g_value_set_string( value, wxGTK_CONV(variant.GetString()) );
     }
     else


@@ -855,7 +857,6 @@ bool wxGtkDataViewListModelNotifier::RowsReordered( size_t *new_order )
 
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }

-

     
     return true;
 }
     
     return true;
 }


@@ -1295,7 +1296,8 @@ wxSize wxDataViewDateCell::GetSize()
 
 bool wxDataViewDateCell::Activate( wxRect cell, wxDataViewListModel *model, size_t col, size_t row )
 {
 
 bool wxDataViewDateCell::Activate( wxRect cell, wxDataViewListModel *model, size_t col, size_t row )
 {

-    wxVariant variant = model->GetValue( col, row );
+    wxVariant variant;
+    model->GetValue( variant, col, row );

     wxDateTime value = variant.GetDateTime();
 
     wxDataViewDateCellPopupTransient *popup = new wxDataViewDateCellPopupTransient( 
     wxDateTime value = variant.GetDateTime();
 
     wxDataViewDateCellPopupTransient *popup = new wxDataViewDateCellPopupTransient( 


@@ -1334,11 +1336,11 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
 
     size_t model_row = (size_t) iter->user_data;
     
 
     size_t model_row = (size_t) iter->user_data;
     

-    wxVariant value = list_store->model->GetValue( 
-        cell->GetOwner()->GetModelColumn(), model_row );
+    wxVariant value;
+    list_store->model->GetValue( value, cell->GetOwner()->GetModelColumn(), model_row );

 
     if (value.GetType() != cell->GetVariantType())
 
     if (value.GetType() != cell->GetVariantType())

-        wxPrintf( wxT("Wrong type\n") );
+        wxLogError( wxT("Wrong type\n") );

                                             
     cell->SetValue( value );
 }
                                             
     cell->SetValue( value );
 }