AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-12 05:20:17 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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)
This commit is contained in:
Owen Taylor 2001-12-27 19:20:23 +00:00 committed by Owen Taylor
parent 2282ef41d1
commit 95f4d72e62
9 changed files with 59 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
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),

7
ChangeLog.pre-2-0
View File

@ -1,3 +1,10 @@
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),

7
ChangeLog.pre-2-10
View File

@ -1,3 +1,10 @@
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),

7
ChangeLog.pre-2-2
View File

@ -1,3 +1,10 @@
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),

7
ChangeLog.pre-2-4
View File

@ -1,3 +1,10 @@
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),

7
ChangeLog.pre-2-6
View File

@ -1,3 +1,10 @@
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),

7
ChangeLog.pre-2-8
View File

@ -1,3 +1,10 @@
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),

13
gtk/gtkplug.c
View File

@ -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

2
gtk/gtksocket.c
View File

@ -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;