dia r4278 - in trunk: . app

[hans svn gnome org]

Author: hans
Date: Sun Feb 15 13:22:49 2009
New Revision: 4278
URL: http://svn.gnome.org/viewvc/dia?rev=4278&view=rev

Log:
2009-02-15  Hans Breuer  <hans breuer org>

	* app/disp_callbacks.c : make empty_menu a really empty DiaMenu with
	menu_items==0 to avoid superfluous separators (bug #532534)
	(ddisplay_canvas_events) : warning - integral size mismatch in argument



Modified:
   trunk/ChangeLog
   trunk/app/disp_callbacks.c

Modified: trunk/app/disp_callbacks.c
==============================================================================
--- trunk/app/disp_callbacks.c	(original)
+++ trunk/app/disp_callbacks.c	Sun Feb 15 13:22:49 2009
@@ -149,6 +149,7 @@
     gtk_widget_show(menu_item);
   }
 
+  /* separator below the menu title */
   menu_item = gtk_menu_item_new();
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
   gtk_widget_show(menu_item);
@@ -201,7 +202,7 @@
 static DiaMenuItem empty_menu_items[] = { {0, } };
 static DiaMenu empty_menu = {
   NULL,
-  sizeof(empty_menu_items)/sizeof(DiaMenuItem),
+  0, /* NOT: sizeof(empty_menu_items)/sizeof(DiaMenuItem), */
   empty_menu_items,
   NULL
 };
@@ -569,7 +570,7 @@
               if (sevent->state & GDK_SHIFT_MASK)
                   ddisplay_scroll_left(ddisp);
               else if (sevent->state & GDK_CONTROL_MASK) {
-                  ddisplay_untransform_coords(ddisp, sevent->x, sevent->y, &middle.x, &middle.y);
+                  ddisplay_untransform_coords(ddisp, (int)sevent->x, (int)sevent->y, &middle.x, &middle.y);
                   ddisplay_zoom(ddisp, &middle, 2);
               }
               else 
@@ -579,7 +580,7 @@
               if (sevent->state & GDK_SHIFT_MASK)
                   ddisplay_scroll_right(ddisp);
               else if (sevent->state & GDK_CONTROL_MASK) { 
-                    ddisplay_untransform_coords(ddisp, sevent->x, sevent->y, &middle.x, &middle.y);
+                    ddisplay_untransform_coords(ddisp, (int)sevent->x, (int)sevent->y, &middle.x, &middle.y);
                     ddisplay_zoom(ddisp, &middle, 0.5);
               }
               else