AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gtk/gtkwidget.c (gtk_widget_real_grab_focus):

Browse Source 
Mon Feb 15 11:13:01 1999  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkwindow.c (gtk_window_set_focus):
	  gtk/gtkwidget.c (gtk_widget_real_grab_focus):

	If the focus widget is the same, but does not currently
	have the focus, call gtk_window_set_focus(). This is needed
	so that click focusing with GtkPlug works correctly.
This commit is contained in:
Owen Taylor 1999-02-15 20:50:47 +00:00 committed by Owen Taylor
parent 3d23ab250e
commit 063bad00a2
9 changed files with 75 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Mon Feb 15 11:13:01 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_set_focus):
gtk/gtkwidget.c (gtk_widget_real_grab_focus):
If the focus widget is the same, but does not currently
have the focus, call gtk_window_set_focus(). This is needed
so that click focusing with GtkPlug works correctly.
Mon Feb 15 07:45:28 1999 Tim Janik <timj@gtk.org>
* configure.in (--enable-debug): default to yes for development trees.

9
ChangeLog.pre-2-0
View File

@ -1,3 +1,12 @@
Mon Feb 15 11:13:01 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_set_focus):
gtk/gtkwidget.c (gtk_widget_real_grab_focus):
If the focus widget is the same, but does not currently
have the focus, call gtk_window_set_focus(). This is needed
so that click focusing with GtkPlug works correctly.
Mon Feb 15 07:45:28 1999 Tim Janik <timj@gtk.org>
* configure.in (--enable-debug): default to yes for development trees.

9
ChangeLog.pre-2-10
View File

@ -1,3 +1,12 @@
Mon Feb 15 11:13:01 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_set_focus):
gtk/gtkwidget.c (gtk_widget_real_grab_focus):
If the focus widget is the same, but does not currently
have the focus, call gtk_window_set_focus(). This is needed
so that click focusing with GtkPlug works correctly.
Mon Feb 15 07:45:28 1999 Tim Janik <timj@gtk.org>
* configure.in (--enable-debug): default to yes for development trees.

9
ChangeLog.pre-2-2
View File

@ -1,3 +1,12 @@
Mon Feb 15 11:13:01 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_set_focus):
gtk/gtkwidget.c (gtk_widget_real_grab_focus):
If the focus widget is the same, but does not currently
have the focus, call gtk_window_set_focus(). This is needed
so that click focusing with GtkPlug works correctly.
Mon Feb 15 07:45:28 1999 Tim Janik <timj@gtk.org>
* configure.in (--enable-debug): default to yes for development trees.

9
ChangeLog.pre-2-4
View File

@ -1,3 +1,12 @@
Mon Feb 15 11:13:01 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_set_focus):
gtk/gtkwidget.c (gtk_widget_real_grab_focus):
If the focus widget is the same, but does not currently
have the focus, call gtk_window_set_focus(). This is needed
so that click focusing with GtkPlug works correctly.
Mon Feb 15 07:45:28 1999 Tim Janik <timj@gtk.org>
* configure.in (--enable-debug): default to yes for development trees.

9
ChangeLog.pre-2-6
View File

@ -1,3 +1,12 @@
Mon Feb 15 11:13:01 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_set_focus):
gtk/gtkwidget.c (gtk_widget_real_grab_focus):
If the focus widget is the same, but does not currently
have the focus, call gtk_window_set_focus(). This is needed
so that click focusing with GtkPlug works correctly.
Mon Feb 15 07:45:28 1999 Tim Janik <timj@gtk.org>
* configure.in (--enable-debug): default to yes for development trees.

9
ChangeLog.pre-2-8
View File

@ -1,3 +1,12 @@
Mon Feb 15 11:13:01 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_set_focus):
gtk/gtkwidget.c (gtk_widget_real_grab_focus):
If the focus widget is the same, but does not currently
have the focus, call gtk_window_set_focus(). This is needed
so that click focusing with GtkPlug works correctly.
Mon Feb 15 07:45:28 1999 Tim Janik <timj@gtk.org>
* configure.in (--enable-debug): default to yes for development trees.

11
gtk/gtkwidget.c
View File

@ -3047,7 +3047,16 @@ gtk_widget_real_grab_focus (GtkWidget *focus_widget)
widget = GTK_WINDOW (toplevel)->focus_widget;
if (widget == focus_widget)
return;
{
/* We call gtk_window_set_focus() here so that the
* toplevel window can request the focus if necessary.
* This is needed when the toplevel is a GtkPlug
*/
if (!GTK_WIDGET_HAS_FOCUS (widget))
gtk_window_set_focus (GTK_WINDOW (toplevel), focus_widget);
return;
}
if (widget)
{

3
gtk/gtkwindow.c
View File

@ -361,7 +361,8 @@ gtk_window_set_focus (GtkWindow *window,
g_return_if_fail (GTK_WIDGET_CAN_FOCUS (focus));
}
if (window->focus_widget != focus)
if ((window->focus_widget != focus) ||
(focus && !GTK_WIDGET_HAS_FOCUS (focus)))
gtk_signal_emit (GTK_OBJECT (window), window_signals[SET_FOCUS], focus);
}