gimp r25133 - in trunk: . app/display

[mitch svn gnome org]

Author: mitch
Date: Wed Mar 19 22:18:54 2008
New Revision: 25133
URL: http://svn.gnome.org/viewvc/gimp?rev=25133&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/app/display/gimpdisplayshell-dnd.c
   trunk/app/display/gimpdisplayshell.c

Modified: trunk/app/display/gimpdisplayshell-dnd.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-dnd.c	(original)
+++ trunk/app/display/gimpdisplayshell-dnd.c	Wed Mar 19 22:18:54 2008
@@ -118,37 +118,37 @@
 {
   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);
 }

Modified: trunk/app/display/gimpdisplayshell.c
==============================================================================
--- trunk/app/display/gimpdisplayshell.c	(original)
+++ trunk/app/display/gimpdisplayshell.c	Wed Mar 19 22:18:54 2008
@@ -1120,6 +1120,10 @@
   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);