[Emacs-diffs] Changes to emacs/src/gtkutil.c

[Jan Dj�rv]

Index: emacs/src/gtkutil.c
diff -c emacs/src/gtkutil.c:1.57 emacs/src/gtkutil.c:1.58
*** emacs/src/gtkutil.c:1.57    Mon Dec 27 15:24:11 2004
--- emacs/src/gtkutil.c Fri Jan  7 16:59:57 2005
***************
*** 2850,2856 ****
       gpointer data;
  {
    gpointer p;
!   int id = (int)data;
  
    p = g_object_get_data (G_OBJECT (widget), XG_LAST_SB_DATA);
    if (p) xfree (p);
--- 2850,2856 ----
       gpointer data;
  {
    gpointer p;
!   int id = (int) (EMACS_INT) data; /* The EMACS_INT cast avoids a warning. */
  
    p = g_object_get_data (G_OBJECT (widget), XG_LAST_SB_DATA);
    if (p) xfree (p);
***************
*** 2920,2929 ****
                      "value-changed",
                      scroll_callback,
                      (gpointer) bar);
    g_signal_connect (G_OBJECT (wscroll),
                      "destroy",
                      G_CALLBACK (xg_gtk_scroll_destroy),
!                     (gpointer) scroll_id);
  
    /* Connect to button press and button release to detect if any scroll bar
       has the pointer.  */
--- 2920,2930 ----
                      "value-changed",
                      scroll_callback,
                      (gpointer) bar);
+   /* The EMACS_INT cast avoids a warning. */
    g_signal_connect (G_OBJECT (wscroll),
                      "destroy",
                      G_CALLBACK (xg_gtk_scroll_destroy),
!                     (gpointer) (EMACS_INT) scroll_id);
  
    /* Connect to button press and button release to detect if any scroll bar
       has the pointer.  */
***************
*** 3112,3118 ****
       GtkWidget *w;
       gpointer client_data;
  {
!   int idx = (int)client_data;
    FRAME_PTR f = (FRAME_PTR) g_object_get_data (G_OBJECT (w), XG_FRAME_DATA);
    Lisp_Object key, frame;
    struct input_event event;
--- 3113,3120 ----
       GtkWidget *w;
       gpointer client_data;
  {
!   /* The EMACS_INT cast avoids a warning. */
!   int idx = (int) (EMACS_INT) client_data;
    FRAME_PTR f = (FRAME_PTR) g_object_get_data (G_OBJECT (w), XG_FRAME_DATA);
    Lisp_Object key, frame;
    struct input_event event;
***************
*** 3209,3215 ****
       GdkEventCrossing *event;
       gpointer client_data;
  {
!   int idx = (int)client_data;
    FRAME_PTR f = (FRAME_PTR) g_object_get_data (G_OBJECT (w), XG_FRAME_DATA);
    Lisp_Object help, frame;
  
--- 3211,3218 ----
       GdkEventCrossing *event;
       gpointer client_data;
  {
!   /* The EMACS_INT cast avoids a warning. */
!   int idx = (int) (EMACS_INT) client_data;
    FRAME_PTR f = (FRAME_PTR) g_object_get_data (G_OBJECT (w), XG_FRAME_DATA);
    Lisp_Object help, frame;
  
***************
*** 3452,3462 ****
  
            gtk_misc_set_padding (GTK_MISC (w), hmargin, vmargin);
  
            gtk_toolbar_append_item (GTK_TOOLBAR (x->toolbar_widget),
                                     0, 0, 0,
                                     w,
                                     GTK_SIGNAL_FUNC (xg_tool_bar_callback),
!                                    (gpointer)i);
  
            /* Save the image so we can see if an update is needed when
               this function is called again.  */
--- 3455,3466 ----
  
            gtk_misc_set_padding (GTK_MISC (w), hmargin, vmargin);
  
+           /* The EMACS_INT cast avoids a warning. */
            gtk_toolbar_append_item (GTK_TOOLBAR (x->toolbar_widget),
                                     0, 0, 0,
                                     w,
                                     GTK_SIGNAL_FUNC (xg_tool_bar_callback),
!                                    (gpointer) (EMACS_INT) i);
  
            /* Save the image so we can see if an update is needed when
               this function is called again.  */
***************
*** 3486,3499 ****
                   rather than the GtkButton specific signals "enter" and
                   "leave", so we can have only one callback.  The event
                   will tell us what kind of event it is.  */
                g_signal_connect (G_OBJECT (w),
                                  "enter-notify-event",
                                  G_CALLBACK (xg_tool_bar_help_callback),
!                                 (gpointer)i);
                g_signal_connect (G_OBJECT (w),
                                  "leave-notify-event",
                                  G_CALLBACK (xg_tool_bar_help_callback),
!                                 (gpointer)i);
              }
          }
        else
--- 3490,3504 ----
                   rather than the GtkButton specific signals "enter" and
                   "leave", so we can have only one callback.  The event
                   will tell us what kind of event it is.  */
+               /* The EMACS_INT cast avoids a warning. */
                g_signal_connect (G_OBJECT (w),
                                  "enter-notify-event",
                                  G_CALLBACK (xg_tool_bar_help_callback),
!                                 (gpointer) (EMACS_INT) i);
                g_signal_connect (G_OBJECT (w),
                                  "leave-notify-event",
                                  G_CALLBACK (xg_tool_bar_help_callback),
!                                 (gpointer) (EMACS_INT) i);
              }
          }
        else