the code to reset the cursor got lost when introducing this function.

2008-03-19  Michael Natterer  <mitch@gimp.org>

	* app/display/gimpdisplayshell.c (gimp_display_shell_empty): the
	code to reset the cursor got lost when introducing this function.

	* app/display/gimpdisplayshell-dnd.c
	(gimp_display_shell_dnd_init): remove redundant casts.


svn path=/trunk/; revision=25133
This commit is contained in:
Michael Natterer 2008-03-19 22:18:54 +00:00 committed by Michael Natterer
parent fb6a3a0eca
commit ca99b0724c
3 changed files with 23 additions and 11 deletions

View File

@ -1,3 +1,11 @@
2008-03-19 Michael Natterer <mitch@gimp.org>
* app/display/gimpdisplayshell.c (gimp_display_shell_empty): the
code to reset the cursor got lost when introducing this function.
* app/display/gimpdisplayshell-dnd.c
(gimp_display_shell_dnd_init): remove redundant casts.
2008-03-19 Michael Natterer <mitch@gimp.org>
* app/display/gimpcanvas.c (gimp_canvas_draw_drop_zone): make the

View File

@ -118,37 +118,37 @@ gimp_display_shell_dnd_init (GimpDisplayShell *shell)
{
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
gimp_dnd_uri_list_dest_add (GTK_WIDGET (shell->canvas),
gimp_dnd_uri_list_dest_add (shell->canvas,
gimp_display_shell_drop_uri_list,
shell);
gimp_dnd_viewable_dest_add (GTK_WIDGET (shell->canvas), GIMP_TYPE_LAYER,
gimp_dnd_viewable_dest_add (shell->canvas, GIMP_TYPE_LAYER,
gimp_display_shell_drop_drawable,
shell);
gimp_dnd_viewable_dest_add (GTK_WIDGET (shell->canvas), GIMP_TYPE_LAYER_MASK,
gimp_dnd_viewable_dest_add (shell->canvas, GIMP_TYPE_LAYER_MASK,
gimp_display_shell_drop_drawable,
shell);
gimp_dnd_viewable_dest_add (GTK_WIDGET (shell->canvas), GIMP_TYPE_CHANNEL,
gimp_dnd_viewable_dest_add (shell->canvas, GIMP_TYPE_CHANNEL,
gimp_display_shell_drop_drawable,
shell);
gimp_dnd_viewable_dest_add (GTK_WIDGET (shell->canvas), GIMP_TYPE_VECTORS,
gimp_dnd_viewable_dest_add (shell->canvas, GIMP_TYPE_VECTORS,
gimp_display_shell_drop_vectors,
shell);
gimp_dnd_viewable_dest_add (GTK_WIDGET (shell->canvas), GIMP_TYPE_PATTERN,
gimp_dnd_viewable_dest_add (shell->canvas, GIMP_TYPE_PATTERN,
gimp_display_shell_drop_pattern,
shell);
gimp_dnd_viewable_dest_add (GTK_WIDGET (shell->canvas), GIMP_TYPE_BUFFER,
gimp_dnd_viewable_dest_add (shell->canvas, GIMP_TYPE_BUFFER,
gimp_display_shell_drop_buffer,
shell);
gimp_dnd_color_dest_add (GTK_WIDGET (shell->canvas),
gimp_dnd_color_dest_add (shell->canvas,
gimp_display_shell_drop_color,
shell);
gimp_dnd_svg_dest_add (GTK_WIDGET (shell->canvas),
gimp_dnd_svg_dest_add (shell->canvas,
gimp_display_shell_drop_svg,
shell);
gimp_dnd_component_dest_add (GTK_WIDGET (shell->canvas),
gimp_dnd_component_dest_add (shell->canvas,
gimp_display_shell_drop_component,
shell);
gimp_dnd_pixbuf_dest_add (GTK_WIDGET (shell->canvas),
gimp_dnd_pixbuf_dest_add (shell->canvas,
gimp_display_shell_drop_pixbuf,
shell);
}

View File

@ -1120,6 +1120,10 @@ gimp_display_shell_empty (GimpDisplayShell *shell)
gimp_display_shell_scale_setup (shell);
gimp_display_shell_scaled (shell);
gimp_display_shell_set_cursor (shell, GIMP_CURSOR_MOUSE,
GIMP_TOOL_CURSOR_NONE,
GIMP_CURSOR_MODIFIER_NONE);
gimp_statusbar_empty (GIMP_STATUSBAR (shell->statusbar));
gimp_display_shell_appearance_update (shell);