diff options
| author | Guido Günther <agx@sigxcpu.org> | 2010-06-26 20:12:25 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2010-06-27 07:28:22 +0200 |
| commit | 496ed42bbd9390572ca58f853062e5aa5695f39a (patch) | |
| tree | 09fbe9a86e159fe72a5fa78c376f49626c68ee97 | |
| parent | 0df55f42e69807643049bebad554c6830f0c4169 (diff) | |
examples: Make demos -DSEAL safe to fix build with GTK+ 3.0
| -rw-r--r-- | tests/examples/equalizer/demo.c | 10 | ||||
| -rw-r--r-- | tests/examples/spectrum/demo-audiotest.c | 10 | ||||
| -rw-r--r-- | tests/examples/spectrum/demo-osssrc.c | 10 |
3 files changed, 18 insertions, 12 deletions
diff --git a/tests/examples/equalizer/demo.c b/tests/examples/equalizer/demo.c index f5b1ec58b..9b365ee23 100644 --- a/tests/examples/equalizer/demo.c +++ b/tests/examples/equalizer/demo.c @@ -83,14 +83,16 @@ draw_spectrum (gfloat * data) if (!drawingarea) return; - gdk_window_begin_paint_rect (drawingarea->window, &rect); - gdk_draw_rectangle (drawingarea->window, drawingarea->style->black_gc, + gdk_window_begin_paint_rect (gtk_widget_get_window (drawingarea), &rect); + gdk_draw_rectangle (gtk_widget_get_window (drawingarea), + gtk_widget_get_style (drawingarea)->black_gc, TRUE, 0, 0, spect_bands, spect_height); for (i = 0; i < spect_bands; i++) { - gdk_draw_rectangle (drawingarea->window, drawingarea->style->white_gc, + gdk_draw_rectangle (gtk_widget_get_window (drawingarea), + gtk_widget_get_style (drawingarea)->white_gc, TRUE, i, -data[i], 1, spect_height + data[i]); } - gdk_window_end_paint (drawingarea->window); + gdk_window_end_paint (gtk_widget_get_window (drawingarea)); } /* receive spectral data from element message */ diff --git a/tests/examples/spectrum/demo-audiotest.c b/tests/examples/spectrum/demo-audiotest.c index a4dc1c309..094ab3168 100644 --- a/tests/examples/spectrum/demo-audiotest.c +++ b/tests/examples/spectrum/demo-audiotest.c @@ -82,14 +82,16 @@ draw_spectrum (gfloat * data) if (!drawingarea) return; - gdk_window_begin_paint_rect (drawingarea->window, &rect); - gdk_draw_rectangle (drawingarea->window, drawingarea->style->black_gc, + gdk_window_begin_paint_rect (gtk_widget_get_window (drawingarea), &rect); + gdk_draw_rectangle (gtk_widget_get_window (drawingarea), + gtk_widget_get_style (drawingarea)->black_gc, TRUE, 0, 0, spect_bands, spect_height); for (i = 0; i < spect_bands; i++) { - gdk_draw_rectangle (drawingarea->window, drawingarea->style->white_gc, + gdk_draw_rectangle (gtk_widget_get_window (drawingarea), + gtk_widget_get_style (drawingarea)->white_gc, TRUE, i, -data[i], 1, spect_height + data[i]); } - gdk_window_end_paint (drawingarea->window); + gdk_window_end_paint (gtk_widget_get_window (drawingarea)); } /* process delayed message */ diff --git a/tests/examples/spectrum/demo-osssrc.c b/tests/examples/spectrum/demo-osssrc.c index b4b66bb0b..091e4b2e0 100644 --- a/tests/examples/spectrum/demo-osssrc.c +++ b/tests/examples/spectrum/demo-osssrc.c @@ -71,14 +71,16 @@ draw_spectrum (gfloat * data) if (!drawingarea) return; - gdk_window_begin_paint_rect (drawingarea->window, &rect); - gdk_draw_rectangle (drawingarea->window, drawingarea->style->black_gc, + gdk_window_begin_paint_rect (gtk_widget_get_window (drawingarea), &rect); + gdk_draw_rectangle (gtk_widget_get_window (drawingarea), + gtk_widget_get_style (drawingarea)->black_gc, TRUE, 0, 0, spect_bands, spect_height); for (i = 0; i < spect_bands; i++) { - gdk_draw_rectangle (drawingarea->window, drawingarea->style->white_gc, + gdk_draw_rectangle (gtk_widget_get_window (drawingarea), + gtk_widget_get_style (drawingarea)->white_gc, TRUE, i, -data[i], 1, spect_height + data[i]); } - gdk_window_end_paint (drawingarea->window); + gdk_window_end_paint (gtk_widget_get_window (drawingarea)); } /* process delayed message */ |