mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-17 09:42:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

remove no longer required gtk_dialog_get_action_area compatability interface

Browse Source
This commit is contained in:
Vincent Sanders 2015-04-10 15:23:15 +01:00
parent 98f8acdfe5
commit 1922eb1e2a
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk/compat.c
View File

@ -377,15 +377,6 @@ GtkWidget *nsgtk_dialog_get_content_area(GtkDialog *dialog)
#endif
}
GtkWidget *nsgtk_dialog_get_action_area(GtkDialog *dialog)
{
#if GTK_CHECK_VERSION(2,14,0)
return gtk_dialog_get_action_area(dialog);
#else
return dialog->action_area;
#endif
}
gboolean nsgtk_show_uri(GdkScreen *screen,
const gchar *uri,
guint32 timestamp,

1
gtk/compat.h
View File

@ -177,7 +177,6 @@ gulong nsgtk_connect_draw_event(GtkWidget *widget, GCallback callback, gpointer
void nsgdk_cursor_unref(GdkCursor *cursor);
void nsgtk_widget_modify_font(GtkWidget *widget, PangoFontDescription *font_desc);
GdkWindow *nsgtk_widget_get_window(GtkWidget *widget);
GtkWidget *nsgtk_dialog_get_action_area(GtkDialog *dialog);
GtkWidget *nsgtk_dialog_get_content_area(GtkDialog *dialog);
gboolean nsgtk_show_uri(GdkScreen *screen, const gchar *uri, guint32 timestamp, GError **error);
GdkWindow *nsgtk_layout_get_bin_window(GtkLayout *layout);

13
gtk/theme.c
View File

@ -260,16 +260,21 @@ void nsgtk_theme_add(const char *themename)
/* notification that theme was added successfully */
notification = gtk_dialog_new_with_buttons(messages_get("gtkThemeAdd"),
NULL, GTK_DIALOG_DESTROY_WITH_PARENT, NSGTK_STOCK_OK,
GTK_RESPONSE_NONE, NULL);
NULL,
GTK_DIALOG_DESTROY_WITH_PARENT,
NSGTK_STOCK_OK, GTK_RESPONSE_NONE,
NULL, NULL);
if (notification == NULL) {
warn_user(messages_get("NoMemory"), 0);
return;
}
len = SLEN("\t\t\t\t\t\t") + strlen(messages_get("gtkThemeAdd")) + 1;
char labelcontent[len];
snprintf(labelcontent, len, "\t\t\t%s\t\t\t",
messages_get("gtkThemeAdd"));
label = gtk_label_new(labelcontent);
if (label == NULL) {
warn_user(messages_get("NoMemory"), 0);
@ -277,7 +282,9 @@ void nsgtk_theme_add(const char *themename)
}
g_signal_connect_swapped(notification, "response",
G_CALLBACK(gtk_widget_destroy), notification);
gtk_container_add(GTK_CONTAINER(nsgtk_dialog_get_action_area(GTK_DIALOG(notification))), label);
gtk_container_add(GTK_CONTAINER(nsgtk_dialog_get_content_area(GTK_DIALOG(notification))), label);
gtk_widget_show_all(notification);
/* update combo */