diff options
| author | Benjamin Otte <otte@redhat.com> | 2010-09-20 12:54:07 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2010-09-26 15:11:43 +0200 |
| commit | f5ad38fdc42da139fee18cf51bf72d449daa35fc (patch) | |
| tree | 0c47d108445bb4c7fc446b40c723bcf592cff26a /demos/gtk-demo | |
| parent | 9826c31a9f22c217f0a1cd4d8334bd22babe1151 (diff) | |
| download | gtk+-f5ad38fdc42da139fee18cf51bf72d449daa35fc.tar.gz | |
gtk-demo: Get rid of gdk_drawable_get_size() usage
Diffstat (limited to 'demos/gtk-demo')
| -rw-r--r-- | demos/gtk-demo/offscreen_window.c | 13 | ||||
| -rw-r--r-- | demos/gtk-demo/offscreen_window2.c | 10 |
2 files changed, 12 insertions, 11 deletions
diff --git a/demos/gtk-demo/offscreen_window.c b/demos/gtk-demo/offscreen_window.c index 98228f03ab..96fd8d4031 100644 --- a/demos/gtk-demo/offscreen_window.c +++ b/demos/gtk-demo/offscreen_window.c @@ -475,7 +475,6 @@ gtk_rotated_bin_draw (GtkWidget *widget, { GtkRotatedBin *bin = GTK_ROTATED_BIN (widget); GdkWindow *window; - gint width, height; gdouble s, c; gdouble w, h; @@ -502,8 +501,10 @@ gtk_rotated_bin_draw (GtkWidget *widget, cairo_translate (cr, -child_area.width / 2, -child_area.height / 2); /* clip */ - gdk_drawable_get_size (bin->offscreen_window, &width, &height); - cairo_rectangle (cr, 0, 0, width, height); + cairo_rectangle (cr, + 0, 0, + gdk_window_get_width (bin->offscreen_window), + gdk_window_get_height (bin->offscreen_window)); cairo_clip (cr); /* paint */ cairo_set_source_surface (cr, surface, 0, 0); @@ -512,12 +513,12 @@ gtk_rotated_bin_draw (GtkWidget *widget, } if (gtk_cairo_should_draw_window (cr, bin->offscreen_window)) { - gdk_drawable_get_size (bin->offscreen_window, &width, &height); - gtk_paint_flat_box (gtk_widget_get_style (widget), cr, GTK_STATE_NORMAL, GTK_SHADOW_NONE, widget, "blah", - 0, 0, width, height); + 0, 0, + gdk_window_get_width (bin->offscreen_window), + gdk_window_get_height (bin->offscreen_window)); if (bin->child) gtk_container_propagate_draw (GTK_CONTAINER (widget), diff --git a/demos/gtk-demo/offscreen_window2.c b/demos/gtk-demo/offscreen_window2.c index c271ce3ed2..b623e303ef 100644 --- a/demos/gtk-demo/offscreen_window2.c +++ b/demos/gtk-demo/offscreen_window2.c @@ -381,7 +381,6 @@ gtk_mirror_bin_draw (GtkWidget *widget, { GtkMirrorBin *bin = GTK_MIRROR_BIN (widget); GdkWindow *window; - gint width, height; window = gtk_widget_get_window (widget); if (gtk_cairo_should_draw_window (cr, window)) @@ -389,11 +388,12 @@ gtk_mirror_bin_draw (GtkWidget *widget, cairo_surface_t *surface; cairo_matrix_t matrix; cairo_pattern_t *mask; + int height; if (bin->child && gtk_widget_get_visible (bin->child)) { surface = gdk_offscreen_window_get_surface (bin->offscreen_window); - gdk_drawable_get_size (bin->offscreen_window, &width, &height); + height = gdk_window_get_height (bin->offscreen_window); /* paint the offscreen child */ cairo_set_source_surface (cr, surface, 0, 0); @@ -422,12 +422,12 @@ gtk_mirror_bin_draw (GtkWidget *widget, } else if (gtk_cairo_should_draw_window (cr, bin->offscreen_window)) { - gdk_drawable_get_size (bin->offscreen_window, &width, &height); - gtk_paint_flat_box (gtk_widget_get_style (widget), cr, GTK_STATE_NORMAL, GTK_SHADOW_NONE, widget, "blah", - 0, 0, width, height); + 0, 0, + gdk_window_get_width (bin->offscreen_window), + gdk_window_get_height (bin->offscreen_window)); if (bin->child) gtk_container_propagate_draw (GTK_CONTAINER (widget), |