Commit 4a02423f authored by Jan Djärv's avatar Jan Djärv

* 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.
parent dd0bed85
2009-03-14 Stephen Berman <stephen.berman@gmx.net>
* 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.
2009-03-13 Stefan Monnier <monnier@iro.umontreal.ca>
* fontset.c (fontset_from_font, Ffontset_info): YAILOM (Yet another
......
......@@ -3457,10 +3457,14 @@ xg_tool_bar_callback (w, client_data)
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_proxy_callback (w, client_data)
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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment