Commit 3ef92965 authored by Daniel Elstner's avatar Daniel Elstner
Browse files

Add -DGTKMM_DISABLE_DEPRECATED.

* src/Makefile.am (global_defines): Add -DGTKMM_DISABLE_DEPRECATED.

* src/filetree.cc (FileTree::FileTree): Replace the deprecated
set_sort_column_id() by set_sort_column().
* src/filetreeprivate.cc
(FileTree::ScopedBlockSorting::ScopedBlockSorting): ditto
(FileTree::ScopedBlockSorting::~ScopedBlockSorting): ditto.

* src/mainwindow.cc (MainWindow::on_go_next): Use scroll_to()
in place of the deprecated scroll_to_mark().
parent a9237177
2004-06-19 Daniel Elstner <daniel.elstner@gmx.net>
* src/Makefile.am (global_defines): Add -DGTKMM_DISABLE_DEPRECATED.
* src/filetree.cc (FileTree::FileTree): Replace the deprecated
set_sort_column_id() by set_sort_column().
* src/filetreeprivate.cc
(FileTree::ScopedBlockSorting::ScopedBlockSorting): ditto
(FileTree::ScopedBlockSorting::~ScopedBlockSorting): ditto.
* src/mainwindow.cc (MainWindow::on_go_next): Use scroll_to()
in place of the deprecated scroll_to_mark().
2004-06-19 Daniel Elstner <daniel.elstner@gmx.net>
* pixmaps/Makefile.am (stockimages.h): Strip the directory prefix
......
......@@ -63,7 +63,8 @@ global_defines = \
-DREGEXXER_DATADIR=\""$(datadir)"\" \
-DREGEXXER_PKGDATADIR=\""$(pkgdatadir)"\" \
-DREGEXXER_LOCALEDIR=\""$(datadir)/locale"\" \
-DREGEXXER_GCONF_DIRECTORY=\""$(REGEXXER_GCONF_DIRECTORY)"\"
-DREGEXXER_GCONF_DIRECTORY=\""$(REGEXXER_GCONF_DIRECTORY)"\" \
-DGTKMM_DISABLE_DEPRECATED
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(global_defines) $(PKG_CFLAGS) $(PCRE_CFLAGS)
regexxer_LDADD = $(LIBINTL) $(PKG_LIBS) $(PCRE_LIBS)
......
......@@ -72,7 +72,7 @@ FileTree::FileTree()
treestore_->set_default_sort_func(&default_sort_func);
treestore_->set_sort_func(model_columns.collatekey, &collatekey_sort_func);
treestore_->set_sort_column_id(TreeStore::DEFAULT_SORT_COLUMN_ID, SORT_ASCENDING);
treestore_->set_sort_column(TreeStore::DEFAULT_SORT_COLUMN_ID, SORT_ASCENDING);
treestore_->signal_rows_reordered().connect(
sigc::mem_fun(*this, &FileTree::on_treestore_rows_reordered));
......@@ -94,7 +94,7 @@ FileTree::FileTree()
column->set_resizable(true);
column->set_expand(true);
column->set_sort_column_id(model_columns.collatekey);
column->set_sort_column(model_columns.collatekey);
}
{
......@@ -110,7 +110,7 @@ FileTree::FileTree()
column->set_alignment(1.0);
cell_matchcount->property_xalign() = 1.0;
column->set_sort_column_id(model_columns.matchcount);
column->set_sort_column(model_columns.matchcount);
}
set_search_column(model_columns.filename);
......
......@@ -254,12 +254,12 @@ FileTree::ScopedBlockSorting::ScopedBlockSorting(FileTree& filetree)
// like that at all, and that's precisely why this utility class exists.
//
if (sort_column_ == FileTreePrivate::FileTreeColumns::instance().matchcount.index())
filetree_.treestore_->set_sort_column_id(Gtk::TreeStore::DEFAULT_SORT_COLUMN_ID, sort_order_);
filetree_.treestore_->set_sort_column(Gtk::TreeStore::DEFAULT_SORT_COLUMN_ID, sort_order_);
}
FileTree::ScopedBlockSorting::~ScopedBlockSorting()
{
filetree_.treestore_->set_sort_column_id(sort_column_, sort_order_);
filetree_.treestore_->set_sort_column(sort_column_, sort_order_);
filetree_.set_headers_clickable(true);
}
......
......@@ -589,7 +589,7 @@ void MainWindow::on_go_next(bool move_forward)
{
if (const Glib::RefPtr<Gtk::TextMark> mark = buffer->get_next_match(move_forward))
{
textview_->scroll_to_mark(mark, 0.125);
textview_->scroll_to(mark, 0.125);
statusline_->set_match_index(buffer->get_match_index());
return;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment