item-grid.c (gnumeric-1.12.49.tar.xz) | : | item-grid.c (gnumeric-1.12.50.tar.xz) | ||
---|---|---|---|---|
skipping to change at line 204 | skipping to change at line 204 | |||
ig->tip = NULL; | ig->tip = NULL; | |||
} | } | |||
return FALSE; | return FALSE; | |||
} | } | |||
static void | static void | |||
item_grid_realize (GocItem *item) | item_grid_realize (GocItem *item) | |||
{ | { | |||
GdkDisplay *display; | GdkDisplay *display; | |||
GnmItemGrid *ig; | GnmItemGrid *ig; | |||
GdkPixbuf *cursor_cross_pixbuf; | cairo_surface_t *cursor_cross; | |||
GtkWidget *widget; | ||||
parent_class->realize (item); | parent_class->realize (item); | |||
ig = GNM_ITEM_GRID (item); | ig = GNM_ITEM_GRID (item); | |||
ig_reload_style (ig); | ig_reload_style (ig); | |||
display = gtk_widget_get_display (GTK_WIDGET (item->canvas)); | widget = GTK_WIDGET (item->canvas); | |||
display = gtk_widget_get_display (widget); | ||||
ig->cursor_link = gdk_cursor_new_for_display (display, GDK_HAND2); | ig->cursor_link = gdk_cursor_new_for_display (display, GDK_HAND2); | |||
cursor_cross_pixbuf = | cursor_cross = | |||
gtk_icon_theme_load_icon (gtk_icon_theme_get_for_screen (gtk_widg | gtk_icon_theme_load_surface (gtk_icon_theme_get_for_screen (gtk_w | |||
et_get_screen (GTK_WIDGET (item->canvas))), | idget_get_screen (widget)), | |||
"cursor-cross", 32, 0, NULL); | "cursor-cross", 32, | |||
gtk_widget_get_scale_factor (widget) | ||||
, | ||||
gtk_widget_get_window (widget), | ||||
0, NULL); | ||||
ig->cursor_cross = | ig->cursor_cross = | |||
gdk_cursor_new_from_pixbuf (display, | gdk_cursor_new_from_surface (display, cursor_cross, 17, 17); | |||
cursor_cross_pixbuf, | cairo_surface_destroy (cursor_cross); | |||
17, 17); | ||||
g_object_unref (cursor_cross_pixbuf); | ||||
cb_cursor_motion (ig); | cb_cursor_motion (ig); | |||
} | } | |||
static void | static void | |||
item_grid_unrealize (GocItem *item) | item_grid_unrealize (GocItem *item) | |||
{ | { | |||
GnmItemGrid *ig = GNM_ITEM_GRID (item); | GnmItemGrid *ig = GNM_ITEM_GRID (item); | |||
g_clear_object (&ig->cursor_link); | g_clear_object (&ig->cursor_link); | |||
g_clear_object (&ig->cursor_cross); | g_clear_object (&ig->cursor_cross); | |||
parent_class->unrealize (item); | parent_class->unrealize (item); | |||
End of changes. 4 change blocks. | ||||
10 lines changed or deleted | 14 lines changed or added |