Implement icon text column using native GTK renderers in wxDVC.

This has a possible advantage of a more native look and feel (although it's
hard to tell the difference between drawing the icon ourselves and how the
default GTK+ renderer does it to be honest) and a very real advantage of
allowing to edit in place cells with icons. It also reduces code duplication
in GTK implementation.

Modify the sample to make the icon-text column in the list model editable to
show that it works. This required storing the values of the second column as
well, so do it in its own array and to avoid calling it "m_array2", rename the
existing m_array to m_textColValues (which accounts for most of the diff in
the sample) and call the new one m_iconColValues.

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

samples/dataview/mymodels.cpp

@@ -334,31 +334,34 @@ MyListModel::MyListModel() :
     m_virtualItems = INITIAL_NUMBER_OF_ITEMS;
 
     // the first 100 items are really stored in this model;
-    // all the others are synthetized on request
-    for (unsigned int i = 0; i < 100; i++)
+    // all the others are synthesized on request
+    static const unsigned NUMBER_REAL_ITEMS = 100;
+
+    m_textColValues.reserve(NUMBER_REAL_ITEMS);
+    for (unsigned int i = 0; i < NUMBER_REAL_ITEMS; i++)
     {
-        wxString str;
-        str.Printf( "real row %d", i );
-        m_array.Add( str );
+        m_textColValues.push_back(wxString::Format("real row %d", i));
     }
 
+    m_iconColValues.assign(NUMBER_REAL_ITEMS, "test");
+
     m_icon[0] = wxIcon( null_xpm );
     m_icon[1] = wxIcon( wx_small_xpm );
 }
 
 void MyListModel::Prepend( const wxString &text )
 {
-    m_array.Insert( text, 0 );
+    m_textColValues.Insert( text, 0 );
     RowPrepended();
 }
 
 void MyListModel::DeleteItem( const wxDataViewItem &item )
 {
     unsigned int row = GetRow( item );
-    if (row >= m_array.GetCount())
+    if (row >= m_textColValues.GetCount())
         return;
 
-    m_array.RemoveAt( row );
+    m_textColValues.RemoveAt( row );
     RowDeleted( row );
 }
 
@@ -369,7 +372,7 @@ void MyListModel::DeleteItems( const wxDataViewItemArray &items )
     for (i = 0; i < items.GetCount(); i++)
     {
         unsigned int row = GetRow( items[i] );
-        if (row < m_array.GetCount())
+        if (row < m_textColValues.GetCount())
             rows.Add( row );
     }
 
@@ -377,7 +380,7 @@ void MyListModel::DeleteItems( const wxDataViewItemArray &items )
     {
         // none of the selected items were in the range of the items
         // which we store... for simplicity, don't allow removing them
-        wxLogError( "Cannot remove rows with an index greater than %d", m_array.GetCount() );
+        wxLogError( "Cannot remove rows with an index greater than %d", m_textColValues.GetCount() );
         return;
     }
 
@@ -386,7 +389,7 @@ void MyListModel::DeleteItems( const wxDataViewItemArray &items )
     // remaining indeces would all be wrong.
     rows.Sort( my_sort_reverse );
     for (i = 0; i < rows.GetCount(); i++)
-        m_array.RemoveAt( rows[i] );
+        m_textColValues.RemoveAt( rows[i] );
 
     // This is just to test if wxDataViewCtrl can
     // cope with removing rows not sorted in
@@ -398,7 +401,7 @@ void MyListModel::DeleteItems( const wxDataViewItemArray &items )
 void MyListModel::AddMany()
 {
     m_virtualItems += 1000;
-    Reset( m_array.GetCount() + m_virtualItems );
+    Reset( m_textColValues.GetCount() + m_virtualItems );
 }
 
 void MyListModel::GetValueByRow( wxVariant &variant,
@@ -406,15 +409,20 @@ void MyListModel::GetValueByRow( wxVariant &variant,
 {
     if (col==0)
     {
-        if (row >= m_array.GetCount())
+        if (row >= m_textColValues.GetCount())
             variant = wxString::Format( "virtual row %d", row );
         else
-            variant = m_array[ row ];
+            variant = m_textColValues[ row ];
     }
     else if (col==1)
     {
-        wxDataViewIconText data( "test", m_icon[ row%2 ] );
-        variant << data;
+        wxString text;
+        if ( row >= m_iconColValues.GetCount() )
+            text = "virtual icon";
+        else
+            text = m_iconColValues[row];
+
+        variant << wxDataViewIconText(text, m_icon[row % 2]);
     }
     else if (col==2)
     {
@@ -474,19 +482,35 @@ bool MyListModel::GetAttrByRow( unsigned int row, unsigned int col,
 bool MyListModel::SetValueByRow( const wxVariant &variant,
                                  unsigned int row, unsigned int col )
 {
-    if (col == 0)
+    switch ( col )
     {
-        if (row >= m_array.GetCount())
-        {
-            // the item is not in the range of the items
-            // which we store... for simplicity, don't allow editing it
-            wxLogError( "Cannot edit rows with an index greater than %d", m_array.GetCount() );
-            return false;
-        }
+        case 0:
+        case 1:
+            if (row >= m_textColValues.GetCount())
+            {
+                // the item is not in the range of the items
+                // which we store... for simplicity, don't allow editing it
+                wxLogError( "Cannot edit rows with an index greater than %d",
+                            m_textColValues.GetCount() );
+                return false;
+            }
 
-        m_array[row] = variant.GetString();
-        return true;
+            if ( col == 0 )
+            {
+                m_textColValues[row] = variant.GetString();
+            }
+            else // col == 1
+            {
+                wxDataViewIconText iconText;
+                iconText << variant;
+                m_iconColValues[row] = iconText.GetText();
+            }
+            break;
+
+        default:
+            wxLogError("Cannot edit the column %d", col);
+            return false;
     }
 
-    return false;
+    return true;
 }