Mercurial > emacs
changeset 102549:f737bc68655e
* 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.
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Sat, 14 Mar 2009 15:12:24 +0000 |
| parents | 419d367f3dc5 |
| children | dd268d718c60 |
| files | src/gtkutil.c |
| diffstat | 1 files changed, 5 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkutil.c Sat Mar 14 03:07:01 2009 +0000 +++ b/src/gtkutil.c Sat Mar 14 15:12:24 2009 +0000 @@ -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,