procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-04 17:59:37 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

Use gtk_widget_get_window() instead of widget->window

Browse source
This commit is contained in:
Michael Natterer 2009-10-09 22:47:02 +02:00
parent 8eccf3e2eb
commit e27f1929d7
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
plug-ins/lighting/lighting-preview.c
View file

@ -308,7 +308,7 @@ draw_handles (void)
if (backbuf.image != NULL) if (backbuf.image != NULL)
{ {
gdk_gc_set_function (gc, GDK_COPY); 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.image, 0, 0, backbuf.x,
backbuf.y, backbuf.w, backbuf.h); backbuf.y, backbuf.w, backbuf.h);
g_object_unref (backbuf.image); g_object_unref (backbuf.image);
@ -361,7 +361,7 @@ draw_handles (void)
if ((backbuf.y + backbuf.h) > PREVIEW_HEIGHT) if ((backbuf.y + backbuf.h) > PREVIEW_HEIGHT)
backbuf.h = (PREVIEW_HEIGHT - backbuf.y); 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.x, backbuf.y,
backbuf.w, backbuf.h); backbuf.w, backbuf.h);
} }
@ -381,19 +381,19 @@ draw_handles (void)
{ {
case POINT_LIGHT: case POINT_LIGHT:
case SPOT_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_xpos - LIGHT_SYMBOL_SIZE / 2,
handle_ypos - LIGHT_SYMBOL_SIZE / 2, handle_ypos - LIGHT_SYMBOL_SIZE / 2,
LIGHT_SYMBOL_SIZE, LIGHT_SYMBOL_SIZE,
LIGHT_SYMBOL_SIZE, 0, 360 * 64); LIGHT_SYMBOL_SIZE, 0, 360 * 64);
break; break;
case DIRECTIONAL_LIGHT: 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_xpos - LIGHT_SYMBOL_SIZE / 2,
handle_ypos - LIGHT_SYMBOL_SIZE / 2, handle_ypos - LIGHT_SYMBOL_SIZE / 2,
LIGHT_SYMBOL_SIZE, LIGHT_SYMBOL_SIZE,
LIGHT_SYMBOL_SIZE, 0, 360 * 64); 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); handle_xpos, handle_ypos, startx+pw/2 , starty + ph/2);
break; break;
case NO_LIGHT: case NO_LIGHT:
@ -473,12 +473,12 @@ draw_preview_image (gboolean recompute)
cursor = gdk_cursor_new_for_display (display, GDK_WATCH); 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); gdk_cursor_unref (cursor);
compute_preview (startx, starty, pw, ph); compute_preview (startx, starty, pw, ph);
cursor = gdk_cursor_new_for_display (display, GDK_HAND2); 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_cursor_unref (cursor);
gdk_flush (); 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, 0, 0, PREVIEW_WIDTH, PREVIEW_HEIGHT,
GDK_RGB_DITHER_MAX, preview_rgb_data, GDK_RGB_DITHER_MAX, preview_rgb_data,
3 * PREVIEW_WIDTH); 3 * PREVIEW_WIDTH);
@ -519,7 +519,7 @@ preview_events (GtkWidget *area,
/* =========================== */ /* =========================== */
if (!gc) if (!gc)
{ {
gc = gdk_gc_new (area->window); gc = gdk_gc_new (gtk_widget_get_window (area));
draw_preview_image (TRUE); draw_preview_image (TRUE);
} }
else else

2
plug-ins/lighting/lighting-ui.c
View file

@ -1106,7 +1106,7 @@ main_dialog (GimpDrawable *drawable)
cursor = gdk_cursor_new_for_display (gtk_widget_get_display (previewarea), cursor = gdk_cursor_new_for_display (gtk_widget_get_display (previewarea),
GDK_HAND2); GDK_HAND2);
gdk_window_set_cursor (previewarea->window, cursor); gdk_window_set_cursor (gtk_widget_get_window (previewarea), cursor);
gdk_cursor_unref (cursor); gdk_cursor_unref (cursor);
} }