From a461197a8398b18b2f9bebfd4608395ba334b012 Mon Sep 17 00:00:00 2001 From: Stefano Karapetsas Date: Wed, 30 Apr 2014 23:22:36 +0200 Subject: gsearchtool: Add GTK3 support --- gsearchtool/gsearchtool-callbacks.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'gsearchtool/gsearchtool-callbacks.c') diff --git a/gsearchtool/gsearchtool-callbacks.c b/gsearchtool/gsearchtool-callbacks.c index 08d946be..6699a3b6 100644 --- a/gsearchtool/gsearchtool-callbacks.c +++ b/gsearchtool/gsearchtool-callbacks.c @@ -38,7 +38,11 @@ #include #include +#include #include +#if GTK_CHECK_VERSION (3, 0, 0) +#include +#endif #include "gsearchtool.h" #include "gsearchtool-callbacks.h" @@ -200,7 +204,7 @@ click_help_cb (GtkWidget * widget, gtk_window_set_title (GTK_WINDOW (dialog), ""); gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); - gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14); + gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 14); g_signal_connect (G_OBJECT (dialog), "response", @@ -365,7 +369,7 @@ display_dialog_file_open_limit (GtkWidget * window, gtk_window_set_title (GTK_WINDOW (dialog), ""); gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); - gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14); + gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 14); button = gtk_button_new_from_stock ("gtk-open"); gtk_widget_set_can_default (button, TRUE); @@ -402,7 +406,7 @@ display_dialog_could_not_open_file (GtkWidget * window, gtk_window_set_title (GTK_WINDOW (dialog), ""); gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); - gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14); + gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 14); g_signal_connect (G_OBJECT (dialog), "response", @@ -431,7 +435,7 @@ display_dialog_could_not_open_folder (GtkWidget * window, gtk_window_set_title (GTK_WINDOW (dialog), ""); gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); - gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14); + gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 14); g_signal_connect (G_OBJECT (dialog), "response", @@ -562,7 +566,7 @@ display_dialog_folder_open_limit (GtkWidget * window, gtk_window_set_title (GTK_WINDOW (dialog), ""); gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); - gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14); + gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 14); button = gtk_button_new_from_stock ("gtk-open"); gtk_widget_set_can_default (button, TRUE); @@ -707,7 +711,7 @@ display_dialog_could_not_move_to_trash (GtkWidget * window, gtk_window_set_title (GTK_WINDOW (dialog), ""); gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); - gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14); + gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 14); g_signal_connect (G_OBJECT (dialog), "response", @@ -742,7 +746,7 @@ display_dialog_delete_permanently (GtkWidget * window, gtk_window_set_title (GTK_WINDOW (dialog), ""); gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); - gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14); + gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 14); button = gtk_button_new_from_stock ("gtk-delete"); gtk_widget_set_can_default (button, TRUE); @@ -780,7 +784,7 @@ display_dialog_could_not_delete (GtkWidget * window, gtk_window_set_title (GTK_WINDOW (dialog), ""); gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); - gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14); + gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 14); g_signal_connect (G_OBJECT (dialog), "response", @@ -1653,7 +1657,7 @@ display_dialog_could_not_save_no_name (GtkWidget * window) gtk_window_set_title (GTK_WINDOW (dialog), ""); gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); - gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14); + gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 14); g_signal_connect (G_OBJECT (dialog), "response", @@ -1685,7 +1689,7 @@ display_dialog_could_not_save_to (GtkWidget * window, gtk_window_set_title (GTK_WINDOW (dialog), ""); gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); - gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14); + gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 14); g_signal_connect (G_OBJECT (dialog), "response", @@ -1722,7 +1726,7 @@ display_dialog_could_not_save_exists (GtkWidget * window, gtk_window_set_title (GTK_WINDOW (dialog), ""); gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); - gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14); + gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 14); button = gsearchtool_button_new_with_stock_icon (_("_Replace"), GTK_STOCK_OK); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); -- cgit v1.2.1