[gnumeric] Compilation: s/GdkDrawable/GdkWindow/



commit c953ca6d9ca7f5b80326b04a3af6bd94a40394a4
Author: Morten Welinder <terra gnome org>
Date:   Thu Dec 2 15:17:00 2010 -0500

    Compilation: s/GdkDrawable/GdkWindow/

 src/dialogs/dialog-about.c |    4 ++--
 src/item-cursor.c          |   20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/src/dialogs/dialog-about.c b/src/dialogs/dialog-about.c
index 23cc9e9..998df9b 100644
--- a/src/dialogs/dialog-about.c
+++ b/src/dialogs/dialog-about.c
@@ -233,7 +233,7 @@ text_item_renderer (AboutRenderer *r, AboutState *state)
 	int age = state->now - r->start_time;
 	double rage = CLAMP (age / (double)r->duration, 0.0, 1.0);
 	GtkWidget *widget = state->anim_area;
-	GdkDrawable *drawable = gtk_widget_get_window (widget);
+	GdkWindow *window = gtk_widget_get_window (widget);
 	GtkStyle *style;
 	const int fade = 500;
 	int x, y, width, height;
@@ -287,7 +287,7 @@ text_item_renderer (AboutRenderer *r, AboutState *state)
 	x -= width / 2;
 	y -= height / 2;
 
-	cr = gdk_cairo_create (drawable);
+	cr = gdk_cairo_create (window);
 	gdk_cairo_set_source_color (cr, &style->text[GTK_STATE_NORMAL]);
 	cairo_move_to (cr, x / (double)PANGO_SCALE, y / (double)PANGO_SCALE);
 	pango_cairo_show_layout (cr, layout);
diff --git a/src/item-cursor.c b/src/item-cursor.c
index b2601fd..6624dc6 100644
--- a/src/item-cursor.c
+++ b/src/item-cursor.c
@@ -218,7 +218,7 @@ item_cursor_draw (GocItem const *item, cairo_t *cr)
 	gboolean draw_stippled, draw_center, draw_external, draw_internal, draw_xor;
 	double scale = item->canvas->pixels_per_unit;
 	GdkEventExpose *expose = (GdkEventExpose *) goc_canvas_get_cur_event (item->canvas);
-	GdkDrawable *drawable = GDK_DRAWABLE (expose->window);
+	GdkWindow *window = expose->window;
 	GdkColor *fore = NULL, *back = NULL;
 
 #if 0
@@ -380,7 +380,7 @@ item_cursor_draw (GocItem const *item, cairo_t *cr)
 		default :
 			g_assert_not_reached ();
 		}
-		gdk_draw_lines (drawable, ic->gc, points, 5);
+		gdk_draw_lines (window, ic->gc, points, 5);
 	}
 
 	if (draw_external && draw_internal && draw_handle) {
@@ -403,33 +403,33 @@ item_cursor_draw (GocItem const *item, cairo_t *cr)
 			points [3].y += 2;
 			points [4].y += 2;
 		}
-		gdk_draw_lines (drawable, ic->gc, points, 5);
+		gdk_draw_lines (window, ic->gc, points, 5);
 	}
 
 	if (draw_handle == 1 || draw_handle == 2) {
 		int const y_off = (draw_handle == 1) ? y1 - y0 : 0;
-		gdk_draw_rectangle (drawable, ic->gc, TRUE,
+		gdk_draw_rectangle (window, ic->gc, TRUE,
 				    x1 - 2,
 				    y0 + y_off - 2,
 				    2, 2);
-		gdk_draw_rectangle (drawable, ic->gc, TRUE,
+		gdk_draw_rectangle (window, ic->gc, TRUE,
 				    x1 + 1,
 				    y0 + y_off - 2,
 				    2, 2);
-		gdk_draw_rectangle (drawable, ic->gc, TRUE,
+		gdk_draw_rectangle (window, ic->gc, TRUE,
 				    x1 - 2,
 				    y0 + y_off + 1,
 				    2, 2);
-		gdk_draw_rectangle (drawable, ic->gc, TRUE,
+		gdk_draw_rectangle (window, ic->gc, TRUE,
 				    x1 + 1,
 				    y0 + y_off + 1,
 				    2, 2);
 	} else if (draw_handle == 3) {
-		gdk_draw_rectangle (drawable, ic->gc, TRUE,
+		gdk_draw_rectangle (window, ic->gc, TRUE,
 				    x1 - 2,
 				    y0 + 1,
 				    2, 4);
-		gdk_draw_rectangle (drawable, ic->gc, TRUE,
+		gdk_draw_rectangle (window, ic->gc, TRUE,
 				    x1 + 1,
 				    y0 + 1,
 				    2, 4);
@@ -453,7 +453,7 @@ item_cursor_draw (GocItem const *item, cairo_t *cr)
 			x0++;
 			y0++;
 		}
-		gdk_draw_rectangle (drawable, ic->gc, FALSE,
+		gdk_draw_rectangle (window, ic->gc, FALSE,
 				    x0, y0,
 				    abs (x1 - x0), abs (y1 - y0));
 	}



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]