From 1658babe452f58f37c84ebcfb34df97e14726351 Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Tue, 14 Jul 2015 15:44:47 +0200 Subject: [PATCH] Remove obsolete GTK compatibility code --- plugins/classbuilder.c | 1 - src/about.c | 1 - src/gtkcompat.h | 8 -------- src/prefs.c | 2 +- 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/plugins/classbuilder.c b/plugins/classbuilder.c index 2cc69198..980cfbda 100644 --- a/plugins/classbuilder.c +++ b/plugins/classbuilder.c @@ -436,7 +436,6 @@ static void show_dialog_create_class(gint type) GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); - gtk_dialog_set_has_separator(GTK_DIALOG(cc_dlg->dialog), TRUE); switch (type) { diff --git a/src/about.c b/src/about.c index b15ae44e..4b468784 100644 --- a/src/about.c +++ b/src/about.c @@ -170,7 +170,6 @@ static GtkWidget *create_dialog(void) gtk_widget_set_name(dialog, "GeanyDialog"); gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE); gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE); - gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE); g_signal_connect(dialog, "key-press-event", G_CALLBACK(gb_on_key_pressed), NULL); /* create header */ diff --git a/src/gtkcompat.h b/src/gtkcompat.h index 2c17ffe3..30f503f3 100644 --- a/src/gtkcompat.h +++ b/src/gtkcompat.h @@ -62,14 +62,6 @@ G_BEGIN_DECLS # define gtk_combo_box_text_get_active_text gtk_combo_box_get_active_text #endif -/* GtkDialog */ -/* GTK 2.22 deprecated dialog separators and 3.0 removed them - * We keep those however in case 2.16 has separators by default */ -#if GTK_CHECK_VERSION(3, 0, 0) -# define gtk_dialog_set_has_separator(dialog, setting) /* nothing */ -# define GTK_DIALOG_NO_SEPARATOR 0 -#endif - /* GtkWidget */ #if ! GTK_CHECK_VERSION(3, 0, 0) # define gtk_widget_get_allocated_height(widget) (((GtkWidget *) (widget))->allocation.height) diff --git a/src/prefs.c b/src/prefs.c index bdf83ec5..ffa53379 100644 --- a/src/prefs.c +++ b/src/prefs.c @@ -178,7 +178,7 @@ static void kb_tree_view_change_button_clicked_cb(GtkWidget *button, KbData *kbd gchar *str; dialog = gtk_dialog_new_with_buttons(_("Grab Key"), GTK_WINDOW(ui_widgets.prefs_dialog), - GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);