diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/shell.c | 24 | ||||
| -rw-r--r-- | shell/stock.c | 12 |
2 files changed, 31 insertions, 5 deletions
diff --git a/shell/shell.c b/shell/shell.c index b37f1ad8..8b0834df 100644 --- a/shell/shell.c +++ b/shell/shell.c @@ -447,7 +447,7 @@ static void create_window(void) shell->status = gtk_label_new(""); #if GTK_CHECK_VERSION(3, 0, 0) - gtk_widget_set_valign(GTK_MISC(shell->status), GTK_ALIGN_CENTER); + gtk_widget_set_valign(GTK_WIDGET(shell->status), GTK_ALIGN_CENTER); #else gtk_misc_set_alignment(GTK_MISC(shell->status), 0.0, 0.5); #endif @@ -512,7 +512,8 @@ static void menu_item_set_icon_always_visible(Shell *shell, path = g_strdup_printf("%s/%s", parent_path, item_id); menuitem = gtk_ui_manager_get_widget(shell->ui_manager, path); -#if GTK_CHECK_VERSION(2, 18, 0) +#if GTK_CHECK_VERSION(3, 0, 0) +#else gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(menuitem), TRUE); #endif g_free(path); @@ -690,7 +691,7 @@ ShellSummary *summary_new(void) GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); #if GTK_CHECK_VERSION(3, 0, 0) - gtk_container_add(GTK_SCROLLED_WINDOW(summary->scroll), + gtk_container_add(GTK_CONTAINER(summary->scroll), summary->view); #else gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(summary->scroll), @@ -992,7 +993,10 @@ static void set_view_type(ShellViewType viewtype, gboolean reload) } /* turn off the rules hint */ +#if GTK_CHECK_VERSION(3, 0, 0) +#else gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(shell->info->view), FALSE); +#endif close_note(NULL, NULL); @@ -1162,10 +1166,13 @@ group_handle_special(GKeyFile * key_file, ShellModuleEntry * entry, g_free(file); } } else if (g_str_equal(key, "Zebra")) { +#if GTK_CHECK_VERSION(3, 0, 0) +#else gtk_tree_view_set_rules_hint(GTK_TREE_VIEW (shell->info->view), g_key_file_get_boolean (key_file, group, key, NULL)); +#endif } } @@ -1654,15 +1661,22 @@ static void shell_summary_add_item(ShellSummary *summary, gtk_box_pack_start(GTK_BOX(frame_label_box), frame_image, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(frame_label_box), frame_label, FALSE, FALSE, 0); + content = gtk_label_new(temp); /* TODO:GTK3 gtk_alignment_new(), etc is deprecated from 3.14 */ +#if GTK_CHECK_VERSION(3, 0, 0) + GtkWidget *frame_box; + frame_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5); + gtk_widget_set_margin_start(GTK_BOX(frame_box), 48); + gtk_box_pack_start(GTK_BOX(frame_box), content, FALSE, FALSE, 0); + gtk_container_add(GTK_CONTAINER(frame), frame_box); +#else alignment = gtk_alignment_new(0.5, 0.5, 1, 1); gtk_alignment_set_padding(GTK_ALIGNMENT(alignment), 0, 0, 48, 0); gtk_widget_show(alignment); gtk_container_add(GTK_CONTAINER(frame), alignment); - - content = gtk_label_new(temp); gtk_misc_set_alignment(GTK_MISC(content), 0.0, 0.5); gtk_container_add(GTK_CONTAINER(alignment), content); +#endif gtk_widget_show_all(frame); gtk_widget_show_all(frame_label_box); diff --git a/shell/stock.c b/shell/stock.c index ad1a0135..86d66778 100644 --- a/shell/stock.c +++ b/shell/stock.c @@ -38,6 +38,8 @@ static GtkIconFactory *icon_factory; void stock_icon_register(gchar * filename, gchar * stock_id) { +#if GTK_CHECK_VERSION(3, 0, 0) +#else GtkIconSet *icon_set; GtkIconSource *icon_source; @@ -52,10 +54,13 @@ void stock_icon_register(gchar * filename, gchar * stock_id) gtk_icon_factory_add(icon_factory, stock_id, icon_set); gtk_icon_set_unref(icon_set); +#endif } void stock_icon_register_pixbuf(GdkPixbuf * pixbuf, gchar * stock_id) { +#if GTK_CHECK_VERSION(3, 0, 0) +#else GtkIconSet *icon_set; GtkIconSource *icon_source; @@ -69,6 +74,7 @@ void stock_icon_register_pixbuf(GdkPixbuf * pixbuf, gchar * stock_id) gtk_icon_factory_add(icon_factory, stock_id, icon_set); gtk_icon_set_unref(icon_set); +#endif } void stock_icons_init(void) @@ -78,14 +84,20 @@ void stock_icons_init(void) DEBUG("initializing stock icons"); +#if GTK_CHECK_VERSION(3, 0, 0) +#else icon_factory = gtk_icon_factory_new(); +#endif for (i = 0; i < n_stock_icons; i++) { stock_icon_register(stock_icons[i].filename, stock_icons[i].stock_id); } +#if GTK_CHECK_VERSION(3, 0, 0) +#else gtk_icon_factory_add_default(icon_factory); +#endif g_object_unref(icon_factory); } |