Commit 95f4d72e authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

gtk/gtkplug.c (gtk_plug_key_press_event): Don't do special handling of key

Thu Dec 27 14:04:22 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtksocket.c (gtk_socket_key_press_event):
	gtk/gtkplug.c (gtk_plug_key_press_event): Don't do
	special handling of key presses unless we are doing
	iter-app embedding. (Fixes #67590, Anders Carlsson)
parent 2282ef41
Thu Dec 27 14:04:22 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.c (gtk_socket_key_press_event):
gtk/gtkplug.c (gtk_plug_key_press_event): Don't do
special handling of key presses unless we are doing
iter-app embedding. (Fixes #67590, Anders Carlsson)
Thu Dec 27 16:37:04 2001 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted),
......
Thu Dec 27 14:04:22 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.c (gtk_socket_key_press_event):
gtk/gtkplug.c (gtk_plug_key_press_event): Don't do
special handling of key presses unless we are doing
iter-app embedding. (Fixes #67590, Anders Carlsson)
Thu Dec 27 16:37:04 2001 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted),
......
Thu Dec 27 14:04:22 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.c (gtk_socket_key_press_event):
gtk/gtkplug.c (gtk_plug_key_press_event): Don't do
special handling of key presses unless we are doing
iter-app embedding. (Fixes #67590, Anders Carlsson)
Thu Dec 27 16:37:04 2001 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted),
......
Thu Dec 27 14:04:22 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.c (gtk_socket_key_press_event):
gtk/gtkplug.c (gtk_plug_key_press_event): Don't do
special handling of key presses unless we are doing
iter-app embedding. (Fixes #67590, Anders Carlsson)
Thu Dec 27 16:37:04 2001 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted),
......
Thu Dec 27 14:04:22 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.c (gtk_socket_key_press_event):
gtk/gtkplug.c (gtk_plug_key_press_event): Don't do
special handling of key presses unless we are doing
iter-app embedding. (Fixes #67590, Anders Carlsson)
Thu Dec 27 16:37:04 2001 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted),
......
Thu Dec 27 14:04:22 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.c (gtk_socket_key_press_event):
gtk/gtkplug.c (gtk_plug_key_press_event): Don't do
special handling of key presses unless we are doing
iter-app embedding. (Fixes #67590, Anders Carlsson)
Thu Dec 27 16:37:04 2001 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted),
......
Thu Dec 27 14:04:22 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.c (gtk_socket_key_press_event):
gtk/gtkplug.c (gtk_plug_key_press_event): Don't do
special handling of key presses unless we are doing
iter-app embedding. (Fixes #67590, Anders Carlsson)
Thu Dec 27 16:37:04 2001 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted),
......
......@@ -567,13 +567,18 @@ static gboolean
gtk_plug_key_press_event (GtkWidget *widget,
GdkEventKey *event)
{
if (!GTK_WINDOW (widget)->has_focus)
if (GTK_WIDGET_TOPLEVEL (widget))
{
gtk_plug_forward_key_press (GTK_PLUG (widget), event);
return TRUE;
if (!GTK_WINDOW (widget)->has_focus)
{
gtk_plug_forward_key_press (GTK_PLUG (widget), event);
return TRUE;
}
else
return GTK_WIDGET_CLASS (parent_class)->key_press_event (widget, event);
}
else
return GTK_WIDGET_CLASS (parent_class)->key_press_event (widget, event);
return FALSE;
}
static void
......
......@@ -687,7 +687,7 @@ gtk_socket_key_press_event (GtkWidget *widget,
{
GtkSocket *socket = GTK_SOCKET (widget);
if (socket->plug_window)
if (GTK_WIDGET_HAS_FOCUS (socket) && socket->plug_window && !socket->plug_widget)
{
XEvent xevent;
......
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