Use set_sort_column() instead of the deprecated set_sort_column_id().

git-svn-id: http://svn.voria.com/code@1521 1f10aa63-cdf2-0310-b900-c93c546f37ac

diff --git a/synfig-studio/trunk/src/gtkmm/childrentree.cpp b/synfig-studio/trunk/src/gtkmm/childrentree.cpp
index 18efcca..deb4334 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/childrentree.cpp
+++ b/synfig-studio/trunk/src/gtkmm/childrentree.cpp
@@ -103,7 +103,7 @@ ChildrenTree::ChildrenTree()
                column->set_resizable();
                column->set_clickable();
                column->set_min_width(150);
-               column->set_sort_column_id(model.label);
+               column->set_sort_column(model.label);
                tree_view.append_column(*column);
 
        }
@@ -115,7 +115,7 @@ ChildrenTree::ChildrenTree()
                        column->set_reorderable();
                        column->set_resizable();
                        column->set_clickable();
-                       column->set_sort_column_id(model.type);
+                       column->set_sort_column(model.type);
                }
        }
        {       // --- V A L U E  -----------------------------------------------------

diff --git a/synfig-studio/trunk/src/gtkmm/compview.cpp b/synfig-studio/trunk/src/gtkmm/compview.cpp
index c6d8065..039ca8a 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/compview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/compview.cpp
@@ -257,7 +257,7 @@ CompView::create_action_tree()
                column->set_resizable();
                column->set_clickable();
 
-               column->set_sort_column_id(COLUMNID_JUMP);
+               column->set_sort_column(COLUMNID_JUMP);
 
                action_tree->append_column(*column);
                //column->clicked();

diff --git a/synfig-studio/trunk/src/gtkmm/dock_history.cpp b/synfig-studio/trunk/src/gtkmm/dock_history.cpp
index 9e9a5ba..91e530f 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/dock_history.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_history.cpp
@@ -207,7 +207,7 @@ Dock_History::create_action_tree()
                column->set_resizable();
                column->set_clickable();
 
-               column->set_sort_column_id(COLUMNID_JUMP);
+               column->set_sort_column(COLUMNID_JUMP);
 
                action_tree->append_column(*column);
                //column->clicked();

diff --git a/synfig-studio/trunk/src/gtkmm/layergrouptree.cpp b/synfig-studio/trunk/src/gtkmm/layergrouptree.cpp
index 05831c8..824f48b 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/layergrouptree.cpp
+++ b/synfig-studio/trunk/src/gtkmm/layergrouptree.cpp
@@ -74,7 +74,7 @@ LayerGroupTree::LayerGroupTree()
                index=append_column_editable(_("Name"),model.label);
                label_column = get_column(index-1);
 
-               //column->set_sort_column_id(layer_model.index);
+               //column->set_sort_column(layer_model.index);
 
                //set_expander_column(*column);
                //column->set_reorderable();
@@ -124,7 +124,7 @@ LayerGroupTree::set_model(Glib::RefPtr<LayerGroupTreeStore> layer_group_tree_sto
                Glib::RefPtr<Gtk::TreeModelSort> sorted_store(Gtk::TreeModelSort::create(layer_group_tree_store_));
                sorted_store->set_default_sort_func(sigc::ptr_fun(&studio::LayerGroupTreeStore::time_sorter));
                sorted_store->set_sort_func(model.time.index(),sigc::ptr_fun(&studio::LayerGroupTreeStore::time_sorter));
-               sorted_store->set_sort_column_id(model.time.index(), Gtk::SORT_ASCENDING);
+               sorted_store->set_sort_column(model.time.index(), Gtk::SORT_ASCENDING);
                Gtk::TreeView::set_model(sorted_store);
        }
 #else

diff --git a/synfig-studio/trunk/src/gtkmm/layertree.cpp b/synfig-studio/trunk/src/gtkmm/layertree.cpp
index 81460f5..211e97e 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/layertree.cpp
+++ b/synfig-studio/trunk/src/gtkmm/layertree.cpp
@@ -197,7 +197,7 @@ LayerTree::create_layer_tree()
                Gtk::TreeView::Column* column = get_layer_tree_view().get_column(index-1);
                get_layer_tree_view().set_expander_column(*column);
 
-               column->set_sort_column_id(layer_model.z_depth);
+               column->set_sort_column(layer_model.z_depth);
                //column->set_reorderable();
                //column->set_resizable();
                //column->set_clickable();
@@ -223,7 +223,7 @@ LayerTree::create_layer_tree()
 //             index=get_layer_tree_view().append_column_editable(_("Layer"),layer_model.label);
                //Gtk::TreeView::Column* column = get_layer_tree_view().get_column(index-1);
 
-               //column->set_sort_column_id(layer_model.index);
+               //column->set_sort_column(layer_model.index);
 
                //get_layer_tree_view().set_expander_column(*column);
                //column->set_reorderable();
@@ -243,7 +243,7 @@ LayerTree::create_layer_tree()
                column_z_depth->set_resizable();
                column_z_depth->set_clickable();
 
-               column_z_depth->set_sort_column_id(layer_model.z_depth);
+               column_z_depth->set_sort_column(layer_model.z_depth);
        }
 
        get_layer_tree_view().set_enable_search(true);
@@ -350,7 +350,7 @@ LayerTree::create_param_tree()
                column->set_reorderable();
                column->set_resizable();
                column->set_clickable();
-               column->set_sort_column_id(param_model.type);
+               column->set_sort_column(param_model.type);
        }
        /*{     // --- T I M E   T R A C K --------------------------------------------
                Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("Time Track")) );
@@ -524,7 +524,7 @@ LayerTree::set_model(Glib::RefPtr<LayerTreeStore> layer_tree_store)
                sorted_layer_tree_store_->set_default_sort_func(sigc::ptr_fun(&studio::LayerTreeStore::z_sorter));
 
                //sorted_store->set_sort_func(model.time.index(),sigc::mem_fun(&studio::KeyframeTreeStore::time_sorter));
-               //sorted_store->set_sort_column_id(model.time.index(), Gtk::SORT_ASCENDING);
+               //sorted_store->set_sort_column(model.time.index(), Gtk::SORT_ASCENDING);
 
                get_layer_tree_view().set_model(sorted_layer_tree_store_);
        }