[gimp] Use gtk_widget_get_window() instead of widget->window
- From: Michael Natterer <mitch src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gimp] Use gtk_widget_get_window() instead of widget->window
- Date: Fri, 9 Oct 2009 21:03:05 +0000 (UTC)
commit e27f1929d78f10b58ad7816eb9863f0b3ffb51d4
Author: Michael Natterer <mitch gimp org>
Date: Fri Oct 9 22:47:02 2009 +0200
Use gtk_widget_get_window() instead of widget->window
plug-ins/lighting/lighting-preview.c | 18 +++++++++---------
plug-ins/lighting/lighting-ui.c | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/plug-ins/lighting/lighting-preview.c b/plug-ins/lighting/lighting-preview.c
index 2a0e83f..32f456b 100644
--- a/plug-ins/lighting/lighting-preview.c
+++ b/plug-ins/lighting/lighting-preview.c
@@ -308,7 +308,7 @@ draw_handles (void)
if (backbuf.image != NULL)
{
gdk_gc_set_function (gc, GDK_COPY);
- gdk_draw_image (previewarea->window, gc,
+ gdk_draw_image (gtk_widget_get_window (previewarea), gc,
backbuf.image, 0, 0, backbuf.x,
backbuf.y, backbuf.w, backbuf.h);
g_object_unref (backbuf.image);
@@ -361,7 +361,7 @@ draw_handles (void)
if ((backbuf.y + backbuf.h) > PREVIEW_HEIGHT)
backbuf.h = (PREVIEW_HEIGHT - backbuf.y);
- backbuf.image = gdk_drawable_get_image (previewarea->window,
+ backbuf.image = gdk_drawable_get_image (gtk_widget_get_window (previewarea),
backbuf.x, backbuf.y,
backbuf.w, backbuf.h);
}
@@ -381,19 +381,19 @@ draw_handles (void)
{
case POINT_LIGHT:
case SPOT_LIGHT:
- gdk_draw_arc (previewarea->window, gc, TRUE,
+ gdk_draw_arc (gtk_widget_get_window (previewarea), gc, TRUE,
handle_xpos - LIGHT_SYMBOL_SIZE / 2,
handle_ypos - LIGHT_SYMBOL_SIZE / 2,
LIGHT_SYMBOL_SIZE,
LIGHT_SYMBOL_SIZE, 0, 360 * 64);
break;
case DIRECTIONAL_LIGHT:
- gdk_draw_arc (previewarea->window, gc, TRUE,
+ gdk_draw_arc (gtk_widget_get_window (previewarea), gc, TRUE,
handle_xpos - LIGHT_SYMBOL_SIZE / 2,
handle_ypos - LIGHT_SYMBOL_SIZE / 2,
LIGHT_SYMBOL_SIZE,
LIGHT_SYMBOL_SIZE, 0, 360 * 64);
- gdk_draw_line (previewarea->window, gc,
+ gdk_draw_line (gtk_widget_get_window (previewarea), gc,
handle_xpos, handle_ypos, startx+pw/2 , starty + ph/2);
break;
case NO_LIGHT:
@@ -473,12 +473,12 @@ draw_preview_image (gboolean recompute)
cursor = gdk_cursor_new_for_display (display, GDK_WATCH);
- gdk_window_set_cursor (previewarea->window, cursor);
+ gdk_window_set_cursor (gtk_widget_get_window (previewarea), cursor);
gdk_cursor_unref (cursor);
compute_preview (startx, starty, pw, ph);
cursor = gdk_cursor_new_for_display (display, GDK_HAND2);
- gdk_window_set_cursor (previewarea->window, cursor);
+ gdk_window_set_cursor (gtk_widget_get_window (previewarea), cursor);
gdk_cursor_unref (cursor);
gdk_flush ();
@@ -491,7 +491,7 @@ draw_preview_image (gboolean recompute)
}
}
- gdk_draw_rgb_image (previewarea->window, gc,
+ gdk_draw_rgb_image (gtk_widget_get_window (previewarea), gc,
0, 0, PREVIEW_WIDTH, PREVIEW_HEIGHT,
GDK_RGB_DITHER_MAX, preview_rgb_data,
3 * PREVIEW_WIDTH);
@@ -519,7 +519,7 @@ preview_events (GtkWidget *area,
/* =========================== */
if (!gc)
{
- gc = gdk_gc_new (area->window);
+ gc = gdk_gc_new (gtk_widget_get_window (area));
draw_preview_image (TRUE);
}
else
diff --git a/plug-ins/lighting/lighting-ui.c b/plug-ins/lighting/lighting-ui.c
index 67b0e85..123ef05 100644
--- a/plug-ins/lighting/lighting-ui.c
+++ b/plug-ins/lighting/lighting-ui.c
@@ -1106,7 +1106,7 @@ main_dialog (GimpDrawable *drawable)
cursor = gdk_cursor_new_for_display (gtk_widget_get_display (previewarea),
GDK_HAND2);
- gdk_window_set_cursor (previewarea->window, cursor);
+ gdk_window_set_cursor (gtk_widget_get_window (previewarea), cursor);
gdk_cursor_unref (cursor);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]