From: Jan Djärv Date: Thu, 18 Dec 2008 18:48:08 +0000 (+0000) Subject: (xg_frame_resized): Remove check if rows/columns have X-Git-Tag: emacs-pretest-23.0.90~1026 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bfd203253dc34fe3c77d2155ee6b11b0c8147f8d;p=emacs.git (xg_frame_resized): Remove check if rows/columns have changed. (xg_tool_bar_proxy_callback): Put focus on the frame after we have clicked on a detached tool bar button. --- diff --git a/src/ChangeLog b/src/ChangeLog index ceff2a5305c..8267c7764c1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -2,6 +2,8 @@ * gtkutil.c (xg_frame_resized): Remove check if rows/columns have changed. + (xg_tool_bar_proxy_callback): Put focus on the frame after we have + clicked on a detached tool bar button. 2008-12-18 Dan Nicolaescu diff --git a/src/gtkutil.c b/src/gtkutil.c index 6b615539ffb..5f55e6daef6 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -3478,6 +3478,13 @@ xg_tool_bar_proxy_callback (w, client_data) GtkWidget *wbutton = GTK_WIDGET (g_object_get_data (G_OBJECT (w), XG_TOOL_BAR_PROXY_BUTTON)); 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,