From 693b39f1f1f36583a558d109050b90421d983dd7 Mon Sep 17 00:00:00 2001 From: Rob Kendrick Date: Tue, 13 Apr 2010 11:12:28 +0000 Subject: GTK 2.20 removes some widget property access macros that were deprecated in 2.18. Change uses to new function calls. Allows nsgtk to be built on Ubuntu 10.04. svn path=/trunk/netsurf/; revision=10388 --- gtk/gtk_download.c | 2 +- gtk/gtk_scaffolding.c | 2 +- gtk/sexy_icon_entry.c | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'gtk') diff --git a/gtk/gtk_download.c b/gtk/gtk_download.c index 64da611ad..04b71f572 100644 --- a/gtk/gtk_download.c +++ b/gtk/gtk_download.c @@ -438,7 +438,7 @@ void nsgtk_download_do(nsgtk_download_selection_action action) gboolean nsgtk_download_update(gboolean force_update) { /* Be sure we need to update */ - if (!GTK_WIDGET_VISIBLE(nsgtk_download_window)) + if (!gtk_widget_get_visible(GTK_WIDGET(nsgtk_download_window))) return TRUE; GList *list; diff --git a/gtk/gtk_scaffolding.c b/gtk/gtk_scaffolding.c index 0fd49bd61..f0beb4fb8 100644 --- a/gtk/gtk_scaffolding.c +++ b/gtk/gtk_scaffolding.c @@ -862,7 +862,7 @@ MULTIHANDLER(selectall) { struct browser_window *bw = gui_window_get_browser_window(g->top_level); - if (GTK_WIDGET_HAS_FOCUS(g->url_bar)) { + if (gtk_widget_has_focus(g->url_bar)) { LOG(("Selecting all URL bar text")); gtk_editable_select_region(GTK_EDITABLE(g->url_bar), 0, -1); } else { diff --git a/gtk/sexy_icon_entry.c b/gtk/sexy_icon_entry.c index 1dce22e31..adb61c0f9 100644 --- a/gtk/sexy_icon_entry.c +++ b/gtk/sexy_icon_entry.c @@ -209,7 +209,7 @@ sexy_icon_entry_destroy(GtkObject *obj) static void sexy_icon_entry_map(GtkWidget *widget) { - if (GTK_WIDGET_REALIZED(widget) && !GTK_WIDGET_MAPPED(widget)) + if (gtk_widget_get_realized(widget) && !gtk_widget_get_mapped(widget)) { SexyIconEntry *entry = SEXY_ICON_ENTRY(widget); int i; @@ -227,7 +227,7 @@ sexy_icon_entry_map(GtkWidget *widget) static void sexy_icon_entry_unmap(GtkWidget *widget) { - if (GTK_WIDGET_MAPPED(widget)) + if (gtk_widget_get_mapped(widget)) { SexyIconEntry *entry = SEXY_ICON_ENTRY(widget); int i; @@ -374,7 +374,7 @@ sexy_icon_entry_realize(GtkWidget *widget) gdk_window_set_user_data(icon_info->window, widget); gdk_window_set_background(icon_info->window, - &widget->style->base[GTK_WIDGET_STATE(widget)]); + &widget->style->base[gtk_widget_get_state(widget)]); } gtk_widget_queue_resize(widget); @@ -471,7 +471,7 @@ sexy_icon_entry_size_allocate(GtkWidget *widget, GtkAllocation *allocation) GTK_WIDGET_CLASS(parent_class)->size_allocate(widget, allocation); - if (GTK_WIDGET_REALIZED(widget)) + if (gtk_widget_get_realized(widget)) place_windows(SEXY_ICON_ENTRY(widget), allocation); } @@ -558,7 +558,7 @@ draw_icon(GtkWidget *widget, SexyIconEntryPosition icon_pos) GdkPixbuf *pixbuf; gint x, y, width, height; - if (icon_info->icon == NULL || !GTK_WIDGET_REALIZED(widget)) + if (icon_info->icon == NULL || !gtk_widget_get_realized(widget)) return; if ((pixbuf = get_pixbuf_from_icon(entry, icon_pos)) == NULL) @@ -622,7 +622,7 @@ sexy_icon_entry_expose(GtkWidget *widget, GdkEventExpose *event) entry = SEXY_ICON_ENTRY(widget); - if (GTK_WIDGET_DRAWABLE(widget)) + if (gtk_widget_is_drawable(widget)) { gboolean found = FALSE; int i; @@ -640,7 +640,7 @@ sexy_icon_entry_expose(GtkWidget *widget, GdkEventExpose *event) gdk_drawable_get_size(icon_info->window, &width, NULL); gtk_paint_flat_box(widget->style, icon_info->window, - GTK_WIDGET_STATE(widget), GTK_SHADOW_NONE, + gtk_widget_get_state(widget), GTK_SHADOW_NONE, NULL, widget, "entry_bg", 0, 0, width, text_area_alloc.height); -- cgit v1.2.3