mirror of https://github.com/GNOME/gimp.git
Use gtk_widget_get_window() instead of widget->window
This commit is contained in:
parent
c0bf72eb3c
commit
88bb075713
|
@ -1490,7 +1490,7 @@ design_area_realize (GtkWidget *widget)
|
||||||
GdkDisplay *display = gtk_widget_get_display (widget);
|
GdkDisplay *display = gtk_widget_get_display (widget);
|
||||||
GdkCursor *cursor = gdk_cursor_new_for_display (display,
|
GdkCursor *cursor = gdk_cursor_new_for_display (display,
|
||||||
cursors[ifsDesign->op]);
|
cursors[ifsDesign->op]);
|
||||||
gdk_window_set_cursor (widget->window, cursor);
|
gdk_window_set_cursor (gtk_widget_get_window (widget), cursor);
|
||||||
gdk_cursor_unref (cursor);
|
gdk_cursor_unref (cursor);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1505,7 +1505,7 @@ design_area_expose (GtkWidget *widget,
|
||||||
|
|
||||||
if (!ifsDesign->selected_gc)
|
if (!ifsDesign->selected_gc)
|
||||||
{
|
{
|
||||||
ifsDesign->selected_gc = gdk_gc_new (ifsDesign->area->window);
|
ifsDesign->selected_gc = gdk_gc_new (gtk_widget_get_window (ifsDesign->area));
|
||||||
gdk_gc_set_line_attributes (ifsDesign->selected_gc, 2,
|
gdk_gc_set_line_attributes (ifsDesign->selected_gc, 2,
|
||||||
GDK_LINE_SOLID, GDK_CAP_ROUND,
|
GDK_LINE_SOLID, GDK_CAP_ROUND,
|
||||||
GDK_JOIN_ROUND);
|
GDK_JOIN_ROUND);
|
||||||
|
@ -1544,7 +1544,7 @@ design_area_expose (GtkWidget *widget,
|
||||||
|
|
||||||
g_object_unref (layout);
|
g_object_unref (layout);
|
||||||
|
|
||||||
gdk_draw_drawable (widget->window,
|
gdk_draw_drawable (gtk_widget_get_window (widget),
|
||||||
style->fg_gc[GTK_WIDGET_STATE (widget)],
|
style->fg_gc[GTK_WIDGET_STATE (widget)],
|
||||||
ifsDesign->pixmap,
|
ifsDesign->pixmap,
|
||||||
event->area.x, event->area.y,
|
event->area.x, event->area.y,
|
||||||
|
@ -1573,10 +1573,10 @@ design_area_configure (GtkWidget *widget,
|
||||||
{
|
{
|
||||||
g_object_unref (ifsDesign->pixmap);
|
g_object_unref (ifsDesign->pixmap);
|
||||||
}
|
}
|
||||||
ifsDesign->pixmap = gdk_pixmap_new (widget->window,
|
ifsDesign->pixmap = gdk_pixmap_new (gtk_widget_get_window (widget),
|
||||||
widget->allocation.width,
|
widget->allocation.width,
|
||||||
widget->allocation.height,
|
widget->allocation.height,
|
||||||
-1); /* Is this correct? */
|
-1); /* Is this correct? */
|
||||||
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue