Kaydet (Commit) 1658babe authored tarafından Colomban Wendling's avatar Colomban Wendling

Remove obsolete GTK compatibility code

üst 0f5e379e
...@@ -436,7 +436,6 @@ static void show_dialog_create_class(gint type) ...@@ -436,7 +436,6 @@ static void show_dialog_create_class(gint type)
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK, GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL); NULL);
gtk_dialog_set_has_separator(GTK_DIALOG(cc_dlg->dialog), TRUE);
switch (type) switch (type)
{ {
......
...@@ -170,7 +170,6 @@ static GtkWidget *create_dialog(void) ...@@ -170,7 +170,6 @@ static GtkWidget *create_dialog(void)
gtk_widget_set_name(dialog, "GeanyDialog"); gtk_widget_set_name(dialog, "GeanyDialog");
gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE); 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_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); g_signal_connect(dialog, "key-press-event", G_CALLBACK(gb_on_key_pressed), NULL);
/* create header */ /* create header */
......
...@@ -62,14 +62,6 @@ G_BEGIN_DECLS ...@@ -62,14 +62,6 @@ G_BEGIN_DECLS
# define gtk_combo_box_text_get_active_text gtk_combo_box_get_active_text # define gtk_combo_box_text_get_active_text gtk_combo_box_get_active_text
#endif #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 */ /* GtkWidget */
#if ! GTK_CHECK_VERSION(3, 0, 0) #if ! GTK_CHECK_VERSION(3, 0, 0)
# define gtk_widget_get_allocated_height(widget) (((GtkWidget *) (widget))->allocation.height) # define gtk_widget_get_allocated_height(widget) (((GtkWidget *) (widget))->allocation.height)
......
...@@ -178,7 +178,7 @@ static void kb_tree_view_change_button_clicked_cb(GtkWidget *button, KbData *kbd ...@@ -178,7 +178,7 @@ static void kb_tree_view_change_button_clicked_cb(GtkWidget *button, KbData *kbd
gchar *str; gchar *str;
dialog = gtk_dialog_new_with_buttons(_("Grab Key"), GTK_WINDOW(ui_widgets.prefs_dialog), 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_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment