[gimp] Use gtk_widget_get_window() intead of widget->window
- From: Michael Natterer <mitch src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gimp] Use gtk_widget_get_window() intead of widget->window
- Date: Fri, 9 Oct 2009 19:21:26 +0000 (UTC)
commit b71da00ef209d67e282a5e6e60bfc19ea1cb9a78
Author: Michael Natterer <mitch gimp org>
Date: Fri Oct 9 17:18:09 2009 +0200
Use gtk_widget_get_window() intead of widget->window
plug-ins/gfig/gfig-arc.c | 4 ++--
plug-ins/gfig/gfig-circle.c | 4 ++--
plug-ins/gfig/gfig-dialog.c | 13 +++++++------
plug-ins/gfig/gfig-ellipse.c | 4 ++--
plug-ins/gfig/gfig-grid.c | 33 +++++++++++++++++----------------
plug-ins/gfig/gfig-line.c | 4 ++--
plug-ins/gfig/gfig-preview.c | 8 ++++----
plug-ins/gfig/gfig-rectangle.c | 7 ++++---
8 files changed, 40 insertions(+), 37 deletions(-)
---
diff --git a/plug-ins/gfig/gfig-arc.c b/plug-ins/gfig/gfig-arc.c
index 505d936..ed74fd1 100644
--- a/plug-ins/gfig/gfig-arc.c
+++ b/plug-ins/gfig/gfig-arc.c
@@ -590,7 +590,7 @@ d_update_arc_line (GdkPoint *pnt)
/* Draw square on point */
draw_circle (&epnt->pnt, TRUE);
- gdk_draw_line (gfig_context->preview->window,
+ gdk_draw_line (gtk_widget_get_window (gfig_context->preview),
/*gfig_context->preview->style->bg_gc[GTK_STATE_NORMAL],*/
gfig_gc,
spnt->pnt.x,
@@ -606,7 +606,7 @@ d_update_arc_line (GdkPoint *pnt)
epnt = new_dobjpoint (pnt->x, pnt->y);
- gdk_draw_line (gfig_context->preview->window,
+ gdk_draw_line (gtk_widget_get_window (gfig_context->preview),
/*gfig_context->preview->style->bg_gc[GTK_STATE_NORMAL],*/
gfig_gc,
spnt->pnt.x,
diff --git a/plug-ins/gfig/gfig-circle.c b/plug-ins/gfig/gfig-circle.c
index 95852c5..951eb6b 100644
--- a/plug-ins/gfig/gfig-circle.c
+++ b/plug-ins/gfig/gfig-circle.c
@@ -177,7 +177,7 @@ d_update_circle (GdkPoint *pnt)
draw_circle (&edge_pnt->pnt, TRUE);
radius = calc_radius (¢er_pnt->pnt, &edge_pnt->pnt);
- gdk_draw_arc (gfig_context->preview->window,
+ gdk_draw_arc (gtk_widget_get_window (gfig_context->preview),
gfig_gc,
0,
center_pnt->pnt.x - (gint) RINT (radius),
@@ -198,7 +198,7 @@ d_update_circle (GdkPoint *pnt)
radius = calc_radius (¢er_pnt->pnt, &edge_pnt->pnt);
- gdk_draw_arc (gfig_context->preview->window,
+ gdk_draw_arc (gtk_widget_get_window (gfig_context->preview),
gfig_gc,
0,
center_pnt->pnt.x - (gint) RINT (radius),
diff --git a/plug-ins/gfig/gfig-dialog.c b/plug-ins/gfig/gfig-dialog.c
index c27558b..bdacb10 100644
--- a/plug-ins/gfig/gfig-dialog.c
+++ b/plug-ins/gfig/gfig-dialog.c
@@ -786,7 +786,7 @@ draw_circle (GdkPoint *p,
if (!selvals.opts.showcontrol)
return;
- gdk_draw_arc (gfig_context->preview->window,
+ gdk_draw_arc (gtk_widget_get_window (gfig_context->preview),
gfig_gc,
selected,
p->x - SQ_SIZE/2,
@@ -805,7 +805,7 @@ draw_sqr (GdkPoint *p,
if (!selvals.opts.showcontrol)
return;
- gdk_draw_rectangle (gfig_context->preview->window,
+ gdk_draw_rectangle (gtk_widget_get_window (gfig_context->preview),
gfig_gc,
selected,
gfig_scale_x (p->x) - SQ_SIZE / 2,
@@ -2072,7 +2072,8 @@ toggle_obj_type (GtkRadioAction *action,
p_cursors[selvals.otype] = gdk_cursor_new_for_display (display, ctype);
}
- gdk_window_set_cursor (gfig_context->preview->window, p_cursors[selvals.otype]);
+ gdk_window_set_cursor (gtk_widget_get_window (gfig_context->preview),
+ p_cursors[selvals.otype]);
}
/* This could belong in a separate file ... but makes it easier to lump into
@@ -2145,7 +2146,7 @@ void
gfig_draw_arc (gint x, gint y, gint width, gint height, gint angle1,
gint angle2)
{
- gdk_draw_arc (gfig_context->preview->window,
+ gdk_draw_arc (gtk_widget_get_window (gfig_context->preview),
gfig_gc,
FALSE,
gfig_scale_x (x - width),
@@ -2159,7 +2160,7 @@ gfig_draw_arc (gint x, gint y, gint width, gint height, gint angle1,
void
gfig_draw_line (gint x0, gint y0, gint x1, gint y1)
{
- gdk_draw_line (gfig_context->preview->window,
+ gdk_draw_line (gtk_widget_get_window (gfig_context->preview),
gfig_gc,
gfig_scale_x (x0),
gfig_scale_y (y0),
@@ -2173,7 +2174,7 @@ gfig_new_gc (void)
GdkColor fg, bg;
/* create a new graphics context */
- gfig_gc = gdk_gc_new (gfig_context->preview->window);
+ gfig_gc = gdk_gc_new (gtk_widget_get_window (gfig_context->preview));
gdk_gc_set_function (gfig_gc, GDK_INVERT);
diff --git a/plug-ins/gfig/gfig-ellipse.c b/plug-ins/gfig/gfig-ellipse.c
index c58691b..b6e3fb3 100644
--- a/plug-ins/gfig/gfig-ellipse.c
+++ b/plug-ins/gfig/gfig-ellipse.c
@@ -210,7 +210,7 @@ d_update_ellipse (GdkPoint *pnt)
draw_circle (&edge_pnt->pnt, TRUE);
- gdk_draw_arc (gfig_context->preview->window,
+ gdk_draw_arc (gtk_widget_get_window (gfig_context->preview),
gfig_gc,
0,
top_x,
@@ -242,7 +242,7 @@ d_update_ellipse (GdkPoint *pnt)
else
top_y = edge_pnt->pnt.y;
- gdk_draw_arc (gfig_context->preview->window,
+ gdk_draw_arc (gtk_widget_get_window (gfig_context->preview),
gfig_gc,
0,
top_x,
diff --git a/plug-ins/gfig/gfig-grid.c b/plug-ins/gfig/gfig-grid.c
index 404f74d..4625a10 100644
--- a/plug-ins/gfig/gfig-grid.c
+++ b/plug-ins/gfig/gfig-grid.c
@@ -215,9 +215,9 @@ gfig_grid_colours (GtkWidget *widget)
values.background.pixel = col1.pixel;
values.foreground.pixel = col2.pixel;
values.fill = GDK_OPAQUE_STIPPLED;
- values.stipple = gdk_bitmap_create_from_data (widget->window,
+ values.stipple = gdk_bitmap_create_from_data (gtk_widget_get_window (widget),
(gchar *) stipple, 4, 4);
- grid_hightlight_drawgc = gdk_gc_new_with_values (widget->window,
+ grid_hightlight_drawgc = gdk_gc_new_with_values (gtk_widget_get_window (widget),
&values,
GDK_GC_FOREGROUND |
GDK_GC_BACKGROUND |
@@ -407,7 +407,7 @@ draw_grid_polar (GdkGC *drawgc)
gdouble t;
gdouble sector_size = 2 * G_PI / current_sectors;
- gdk_draw_arc (gfig_context->preview->window,
+ gdk_draw_arc (gtk_widget_get_window (gfig_context->preview),
drawgc,
0,
0.5 + (preview_width / 2 - outer_radius),
@@ -430,7 +430,7 @@ draw_grid_polar (GdkGC *drawgc)
gdouble normal_x = cos (selvals.opts.grid_rotation+t);
gdouble normal_y = sin (selvals.opts.grid_rotation+t);
- gdk_draw_line (gfig_context->preview->window,
+ gdk_draw_line (gtk_widget_get_window (gfig_context->preview),
drawgc,
0.5 + (preview_width / 2 + inner_radius * normal_x),
0.5 + (preview_height / 2 - inner_radius * normal_y),
@@ -454,7 +454,7 @@ draw_grid_sq (GdkGC *drawgc)
for (loop = 0 ; loop < preview_height ; loop += step)
{
- gdk_draw_line (gfig_context->preview->window,
+ gdk_draw_line (gtk_widget_get_window (gfig_context->preview),
drawgc,
0,
loop,
@@ -466,7 +466,7 @@ draw_grid_sq (GdkGC *drawgc)
for (loop = 0 ; loop < preview_width ; loop += step)
{
- gdk_draw_line (gfig_context->preview->window,
+ gdk_draw_line (gtk_widget_get_window (gfig_context->preview),
drawgc,
loop,
0,
@@ -492,14 +492,15 @@ draw_grid_iso (GdkGC *drawgc)
hstep = selvals.opts.gridspacing * COS_1o6PI_RAD;
/* Draw the vertical lines - These are easy */
- for (loop = 0 ; loop < preview_width ; loop += hstep){
- gdk_draw_line (gfig_context->preview->window,
- drawgc,
- (gint)loop,
- (gint)0,
- (gint)loop,
- (gint)preview_height);
- }
+ for (loop = 0 ; loop < preview_width ; loop += hstep)
+ {
+ gdk_draw_line (gtk_widget_get_window (gfig_context->preview),
+ drawgc,
+ (gint)loop,
+ (gint)0,
+ (gint)loop,
+ (gint)preview_height);
+ }
/* draw diag lines at a Theta of +/- 1/6 Pi Rad */
@@ -514,14 +515,14 @@ draw_grid_iso (GdkGC *drawgc)
/* Draw diag lines */
for (loop = diagonal_start ; loop < diagonal_end ; loop += vstep)
{
- gdk_draw_line (gfig_context->preview->window,
+ gdk_draw_line (gtk_widget_get_window (gfig_context->preview),
drawgc,
(gint)0,
(gint)loop,
(gint)diagonal_width,
(gint)loop + diagonal_height);
- gdk_draw_line (gfig_context->preview->window,
+ gdk_draw_line (gtk_widget_get_window (gfig_context->preview),
drawgc,
(gint)0,
(gint)loop,
diff --git a/plug-ins/gfig/gfig-line.c b/plug-ins/gfig/gfig-line.c
index 5639f0f..1e2d2a4 100644
--- a/plug-ins/gfig/gfig-line.c
+++ b/plug-ins/gfig/gfig-line.c
@@ -152,7 +152,7 @@ d_update_line (GdkPoint *pnt)
/* Draw square on point */
draw_circle (&epnt->pnt, TRUE);
- gdk_draw_line (gfig_context->preview->window,
+ gdk_draw_line (gtk_widget_get_window (gfig_context->preview),
gfig_gc,
spnt->pnt.x,
spnt->pnt.y,
@@ -167,7 +167,7 @@ d_update_line (GdkPoint *pnt)
epnt = new_dobjpoint (pnt->x, pnt->y);
- gdk_draw_line (gfig_context->preview->window,
+ gdk_draw_line (gtk_widget_get_window (gfig_context->preview),
gfig_gc,
spnt->pnt.x,
spnt->pnt.y,
diff --git a/plug-ins/gfig/gfig-preview.c b/plug-ins/gfig/gfig-preview.c
index 244dfd4..60d5dfe 100644
--- a/plug-ins/gfig/gfig-preview.c
+++ b/plug-ins/gfig/gfig-preview.c
@@ -138,7 +138,7 @@ gfig_preview_realize (GtkWidget *widget)
{
GdkDisplay *display = gtk_widget_get_display (widget);
- gdk_window_set_cursor (gfig_context->preview->window,
+ gdk_window_set_cursor (gtk_widget_get_window (gfig_context->preview),
gdk_cursor_new_for_display (display, GDK_CROSSHAIR));
gfig_grid_colours (widget);
}
@@ -152,8 +152,8 @@ draw_background (void)
GIMP_PIXBUF_LARGE_CHECKS);
if (back_pixbuf)
- gdk_draw_pixbuf (gfig_context->preview->window,
- gfig_context->preview->style->fg_gc[GTK_STATE_NORMAL],
+ gdk_draw_pixbuf (gtk_widget_get_window (gfig_context->preview),
+ gtk_widget_get_style (gfig_context->preview)->fg_gc[GTK_STATE_NORMAL],
back_pixbuf, 0, 0,
0, 0,
gdk_pixbuf_get_width (back_pixbuf),
@@ -165,7 +165,7 @@ gboolean
gfig_preview_expose (GtkWidget *widget,
GdkEvent *event)
{
- gdk_window_clear (gfig_context->preview->window);
+ gdk_window_clear (gtk_widget_get_window (gfig_context->preview));
if (gfig_context->show_background)
draw_background ();
diff --git a/plug-ins/gfig/gfig-rectangle.c b/plug-ins/gfig/gfig-rectangle.c
index dc6bcf5..9bcda7a 100644
--- a/plug-ins/gfig/gfig-rectangle.c
+++ b/plug-ins/gfig/gfig-rectangle.c
@@ -88,7 +88,8 @@ d_draw_rectangle (GfigObject *obj)
gfig_scale_x (second_pnt->pnt.x));
ymax = MAX (gfig_scale_y (first_pnt->pnt.y),
gfig_scale_y (second_pnt->pnt.y));
- gdk_draw_rectangle (gfig_context->preview->window,
+
+ gdk_draw_rectangle (gtk_widget_get_window (gfig_context->preview),
gfig_gc,
FALSE,
xmin, ymin,
@@ -199,7 +200,7 @@ d_update_rectangle (GdkPoint *pnt)
gfig_scale_x (second_pnt->pnt.x));
ymax = MAX (gfig_scale_y (first_pnt->pnt.y),
gfig_scale_y (second_pnt->pnt.y));
- gdk_draw_rectangle (gfig_context->preview->window,
+ gdk_draw_rectangle (gtk_widget_get_window (gfig_context->preview),
gfig_gc,
FALSE,
xmin, ymin, xmax - xmin, ymax - ymin);
@@ -222,7 +223,7 @@ d_update_rectangle (GdkPoint *pnt)
gfig_scale_x (second_pnt->pnt.x));
ymax = MAX (gfig_scale_y (first_pnt->pnt.y),
gfig_scale_y (second_pnt->pnt.y));
- gdk_draw_rectangle (gfig_context->preview->window,
+ gdk_draw_rectangle (gtk_widget_get_window (gfig_context->preview),
gfig_gc, FALSE,
xmin, ymin, xmax - xmin, ymax - ymin);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
