diff options
author | monsta <[email protected]> | 2016-11-22 15:49:16 +0300 |
---|---|---|
committer | monsta <[email protected]> | 2016-11-22 15:49:16 +0300 |
commit | ea481767c4e3ec19136a5b61ad46f244a9a5ffa7 (patch) | |
tree | bbcceb1d2a0be587e7127109f57e41e9e9b43f98 /mate-dictionary/libgdict/gdict-database-chooser.c | |
parent | 8f9a34f003061d7c5e6cfe8a8cb64ec6e98d7c4a (diff) | |
download | mate-utils-ea481767c4e3ec19136a5b61ad46f244a9a5ffa7.tar.bz2 mate-utils-ea481767c4e3ec19136a5b61ad46f244a9a5ffa7.tar.xz |
move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option
and require mate-panel >= 1.17
Diffstat (limited to 'mate-dictionary/libgdict/gdict-database-chooser.c')
-rw-r--r-- | mate-dictionary/libgdict/gdict-database-chooser.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/mate-dictionary/libgdict/gdict-database-chooser.c b/mate-dictionary/libgdict/gdict-database-chooser.c index 22c9aadb..37572abe 100644 --- a/mate-dictionary/libgdict/gdict-database-chooser.c +++ b/mate-dictionary/libgdict/gdict-database-chooser.c @@ -190,11 +190,7 @@ gdict_database_chooser_dispose (GObject *gobject) if (priv->busy_cursor) { -#if GTK_CHECK_VERSION (3, 0, 0) g_object_unref (priv->busy_cursor); -#else - gdk_cursor_unref (priv->busy_cursor); -#endif priv->busy_cursor = NULL; } @@ -338,17 +334,8 @@ gdict_database_chooser_constructor (GType type, chooser = GDICT_DATABASE_CHOOSER (object); priv = chooser->priv; -#if !GTK_CHECK_VERSION(3,0,0) - gtk_widget_push_composite_child (); -#endif - sw = gtk_scrolled_window_new (NULL, NULL); -#if GTK_CHECK_VERSION (3, 0, 0) gtk_widget_set_vexpand (sw, TRUE); -#endif -#if !GTK_CHECK_VERSION(3,0,0) - gtk_widget_set_composite_name (sw, "gdict-database-chooser-scrolled-window"); -#endif gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); @@ -364,9 +351,6 @@ gdict_database_chooser_constructor (GType type, "weight", DB_COLUMN_CURRENT, NULL); priv->treeview = gtk_tree_view_new (); -#if !GTK_CHECK_VERSION(3,0,0) - gtk_widget_set_composite_name (priv->treeview, "gdict-database-chooser-treeview"); -#endif gtk_tree_view_set_model (GTK_TREE_VIEW (priv->treeview), GTK_TREE_MODEL (priv->store)); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (priv->treeview), FALSE); @@ -379,11 +363,7 @@ gdict_database_chooser_constructor (GType type, gtk_container_add (GTK_CONTAINER (sw), priv->treeview); gtk_widget_show (priv->treeview); -#if GTK_CHECK_VERSION (3, 0, 0) hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); -#else - hbox = gtk_hbox_new (FALSE, 0); -#endif priv->buttons_box = hbox; priv->refresh_button = gtk_button_new (); @@ -413,10 +393,6 @@ gdict_database_chooser_constructor (GType type, gtk_box_pack_end (GTK_BOX (chooser), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); -#if !GTK_CHECK_VERSION(3,0,0) - gtk_widget_pop_composite_child (); -#endif - return object; } @@ -733,15 +709,11 @@ lookup_start_cb (GdictContext *context, GdictDatabaseChooserPrivate *priv = chooser->priv; if (!priv->busy_cursor) -#if GTK_CHECK_VERSION(3,0,0) { GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (chooser)); priv->busy_cursor = gdk_cursor_new_for_display (display, GDK_WATCH); } -#else - priv->busy_cursor = gdk_cursor_new (GDK_WATCH); -#endif if (gtk_widget_get_window (GTK_WIDGET (chooser))) gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (chooser)), priv->busy_cursor); |