0
0
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00

updated for version 7.0230

This commit is contained in:
Bram Moolenaar
2006-03-20 21:55:45 +00:00
parent 0126585dbb
commit 9b2200acd6
13 changed files with 138 additions and 25 deletions

View File

@@ -320,6 +320,19 @@ create_menu_icon(vimmenu_T *menu, GtkIconSize icon_size)
return image;
}
/*ARGSUSED*/
static gint
toolbar_button_focus_in_event(GtkWidget *widget, GdkEventFocus *event, gpointer data)
{
/* When we're in a GtkPlug, we don't have window focus events, only widget focus.
* To emulate stand-alone gvim, if a button gets focus (e.g., <Tab> into GtkPlug)
* immediately pass it to mainwin.
*/
if (gtk_socket_id != 0)
gtk_widget_grab_focus(gui.drawarea);
return TRUE;
}
#endif /* FEAT_TOOLBAR && HAVE_GTK2 */
#if (defined(FEAT_TOOLBAR) && defined(HAVE_GTK2)) || defined(PROTO)
@@ -767,6 +780,10 @@ gui_mch_add_menu_item(vimmenu_T *menu, int idx)
menu,
idx);
if (gtk_socket_id != 0)
gtk_signal_connect(GTK_OBJECT(menu->id), "focus_in_event",
GTK_SIGNAL_FUNC(toolbar_button_focus_in_event), NULL);
CONVERT_TO_UTF8_FREE(text);
CONVERT_TO_UTF8_FREE(tooltip);