[Emacs-diffs] emacs/src gtkutil.c

[Jan Djärv]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jan Djärv <jhd> 09/03/14 15:12:24

Modified files:
        src            : gtkutil.c 

Log message:
                * gtkutil.c (xg_tool_bar_callback): Set focus back to the frame
                after clicking in a detached tool bar.
                (xg_tool_bar_proxy_callback): Remove call to Fx_focus_frame.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/gtkutil.c?cvsroot=emacs&r1=1.147&r2=1.148

Patches:
Index: gtkutil.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/gtkutil.c,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -b -r1.147 -r1.148
--- gtkutil.c   2 Mar 2009 08:55:49 -0000       1.147
+++ gtkutil.c   14 Mar 2009 15:12:24 -0000      1.148
@@ -3457,10 +3457,14 @@
   event.frame_or_window = frame;
   event.arg = key;
   /* Convert between the modifier bits GDK uses and the modifier bits
-     Emacs uses.  This assumes GDK an X masks are the same, which they are when
+     Emacs uses.  This assumes GDK and X masks are the same, which they are 
when
      this is written.  */
   event.modifiers = x_x_to_emacs_modifiers (FRAME_X_DISPLAY_INFO (f), mod);
   kbd_buffer_store_event (&event);
+ 
+   /* Return focus to the frame after we have clicked on a detached
+      tool bar button. */
+   Fx_focus_frame (frame);
 }
 
 /* Callback function invoked when a tool bar item is pressed in a detached
@@ -3480,11 +3484,6 @@
   xg_tool_bar_callback (wbutton, client_data);
   FRAME_PTR f = (FRAME_PTR) g_object_get_data (G_OBJECT (wbutton),
                                                XG_FRAME_DATA);
-  /* Put focus back to the frame after we have clicked on a detached
-     tool bar button. */
-  Lisp_Object frame;
-  XSETFRAME (frame, f);
-  Fx_focus_frame (frame);
 }
 
 /* This callback is called when a tool item should create a proxy item,