summaryrefslogtreecommitdiffstats
path: root/src/widgets/toolbox.cpp
diff options
context:
space:
mode:
authorJon A. Cruz <jon@joncruz.org>2007-12-06 08:38:16 +0000
committerjoncruz <joncruz@users.sourceforge.net>2007-12-06 08:38:16 +0000
commitf530fe3cffcb378df2a076ae12da8c8e498e9495 (patch)
treea4ae6c3c21fd291db4532ecb08589a6bf13f9482 /src/widgets/toolbox.cpp
parentWarning cleanup (diff)
downloadinkscape-f530fe3cffcb378df2a076ae12da8c8e498e9495.tar.gz
inkscape-f530fe3cffcb378df2a076ae12da8c8e498e9495.zip
Removed conditional GTK+ < 2.6.0 code since 2.8.0 has been a requirement for almost a year
(bzr r4184)
Diffstat (limited to 'src/widgets/toolbox.cpp')
-rw-r--r--src/widgets/toolbox.cpp11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index d92e7e7a6..9d57dfb5a 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -4355,16 +4355,7 @@ sp_text_toolbox_size_changed (GtkComboBox *cbox,
if (g_object_get_data (tbl, "size-block")) return;
-#if GTK_CHECK_VERSION(2,6,0)
char *text = gtk_combo_box_get_active_text (cbox);
-#else // GTK_CHECK_VERSION(2,6,0)
- GtkTreeModel *model = gtk_combo_box_get_model (cbox);
- GtkTreeIter iter;
- char *text = NULL;
-
- if (gtk_combo_box_get_active_iter (cbox, &iter) && model)
- gtk_tree_model_get (model, &iter, 0, &text, -1);
-#endif // GTK_CHECK_VERSION(2,6,0)
SPCSSAttr *css = sp_repr_css_attr_new ();
sp_repr_css_set_property (css, "font-size", text);
@@ -4531,9 +4522,7 @@ sp_text_toolbox_new (SPDesktop *desktop)
gtk_tree_view_set_model (GTK_TREE_VIEW (treeview), GTK_TREE_MODEL (Glib::unwrap(store)));
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE);
-#if GTK_CHECK_VERSION(2,6,0)
gtk_tree_view_set_fixed_height_mode (GTK_TREE_VIEW (treeview), TRUE);
-#endif // GTK_CHECK_VERSION(2,6,0)
//gtk_tree_view_set_enable_search (GTK_TREE_VIEW (treeview), TRUE);