diff options
| author | Rob Kendrick <rjek@netsurf-browser.org> | 2010-04-13 11:22:35 +0000 |
|---|---|---|
| committer | Rob Kendrick <rjek@netsurf-browser.org> | 2010-04-13 11:22:35 +0000 |
| commit | 9bb36f143e68e6ee766fa15d4bdbadb7f99e8909 (patch) | |
| tree | 7bd5bc6df9b228ceff1831a3dc4d773b49dcb929 /gtk/sexy_icon_entry.c | |
| parent | e7ca0aaeb079c3fcbfee1df2e7379e07921f467d (diff) | |
| download | netsurf-9bb36f143e68e6ee766fa15d4bdbadb7f99e8909.tar.gz netsurf-9bb36f143e68e6ee766fa15d4bdbadb7f99e8909.tar.bz2 | |
Revert previous two changes, as it breaks far too recent versions of GTK.
svn path=/trunk/netsurf/; revision=10390
Diffstat (limited to 'gtk/sexy_icon_entry.c')
| -rw-r--r-- | gtk/sexy_icon_entry.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk/sexy_icon_entry.c b/gtk/sexy_icon_entry.c index adb61c0f9..1dce22e31 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_get_realized(widget) && !gtk_widget_get_mapped(widget)) + if (GTK_WIDGET_REALIZED(widget) && !GTK_WIDGET_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_get_mapped(widget)) + if (GTK_WIDGET_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_get_state(widget)]); + &widget->style->base[GTK_WIDGET_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_get_realized(widget)) + if (GTK_WIDGET_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_get_realized(widget)) + if (icon_info->icon == NULL || !GTK_WIDGET_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_is_drawable(widget)) + if (GTK_WIDGET_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_get_state(widget), GTK_SHADOW_NONE, + GTK_WIDGET_STATE(widget), GTK_SHADOW_NONE, NULL, widget, "entry_bg", 0, 0, width, text_area_alloc.height); |