comparison src/bar_histogram.c @ 1810:c416d099a3dc

GTK marks several functions as deprecated The following functions has been replaced and deprecated by version 2.20: - GTK_WIDGET_CAN_FOCUS - GTK_WIDGET_DRAWABLE - GTK_WIDGET_HAS_FOCUS - GTK_WIDGET_HAS_GRAB - GTK_WIDGET_IS_SENSITIVE - GTK_WIDGET_NO_WINDOW - GTK_WIDGET_REALIZED - GTK_WIDGET_SENSITIVE - GTK_WIDGET_STATE - GTK_WIDGET_TOPLEVEL - GTK_WIDGET_VISIBLE
author mow
date Mon, 10 May 2010 11:32:56 +0000
parents 956aab097ea7
children
comparison
equal deleted inserted replaced
1809:e1c18f81e637 1810:c416d099a3dc
59 if (!phd->histogram_width || !phd->histogram_height || !phd->fd) return; 59 if (!phd->histogram_width || !phd->histogram_height || !phd->fd) return;
60 60
61 /* histmap_get is relatively expensive, run it only when we really need it 61 /* histmap_get is relatively expensive, run it only when we really need it
62 and with lower priority than pixbuf_renderer 62 and with lower priority than pixbuf_renderer
63 FIXME: this does not work for fullscreen*/ 63 FIXME: this does not work for fullscreen*/
64 #if GTK_CHECK_VERSION(2,20,0)
65 if (gtk_widget_is_drawable(phd->drawing_area))
66 #else
64 if (GTK_WIDGET_DRAWABLE(phd->drawing_area)) 67 if (GTK_WIDGET_DRAWABLE(phd->drawing_area))
68 #endif
65 { 69 {
66 if (!phd->idle_id) 70 if (!phd->idle_id)
67 { 71 {
68 phd->idle_id = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE, bar_pane_histogram_update_cb, phd, NULL); 72 phd->idle_id = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE, bar_pane_histogram_update_cb, phd, NULL);
69 } 73 }
151 } 155 }
152 156
153 if (!phd->pixbuf) return TRUE; 157 if (!phd->pixbuf) return TRUE;
154 158
155 gdk_draw_pixbuf(widget->window, 159 gdk_draw_pixbuf(widget->window,
160 #if GTK_CHECK_VERSION(2,20,0)
161 widget->style->fg_gc[gtk_widget_get_state(widget)],
162 #else
156 widget->style->fg_gc[GTK_WIDGET_STATE (widget)], 163 widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
164 #endif
157 phd->pixbuf, 165 phd->pixbuf,
158 0, 0, 166 0, 0,
159 0, 0, 167 0, 0,
160 -1, -1, 168 -1, -1,
161 GDK_RGB_DITHER_NORMAL, 0, 0); 169 GDK_RGB_DITHER_NORMAL, 0, 0);