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

entry: Activate default via action

Browse Source 
Switch to the new way of activating default.
This commit is contained in:
Matthias Clasen 2019-04-28 18:12:53 +00:00
parent 7553d0c471
commit 218d635ca2
4 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtkentry.c
View File

@ -2120,10 +2120,6 @@ gtk_entry_get_text_length (GtkEntry *entry)
* widget for the window containing the entry. This usually means that * widget for the window containing the entry. This usually means that
* the dialog box containing the entry will be closed, since the default * the dialog box containing the entry will be closed, since the default
* widget is usually one of the dialog buttons. * widget is usually one of the dialog buttons.
*
* (For experts: if @setting is %TRUE, the entry calls
* gtk_window_activate_default() on the window containing the entry, in
* the default handler for the #GtkEntry::activate signal.)
**/ **/
void void
gtk_entry_set_activates_default (GtkEntry *entry, gtk_entry_set_activates_default (GtkEntry *entry,

3
gtk/gtkentry.h
View File

@ -82,8 +82,7 @@ struct _GtkEntry
* non-%NULL, this will be called to add additional entries to the context * non-%NULL, this will be called to add additional entries to the context
* menu when it is displayed. * menu when it is displayed.
* @activate: Class handler for the #GtkEntry::activate signal. The default * @activate: Class handler for the #GtkEntry::activate signal. The default
* implementation calls gtk_window_activate_default() on the entry’s top-level * implementation activates the gtk.activate-default action.
* window.
* @move_cursor: Class handler for the #GtkEntry::move-cursor signal. The * @move_cursor: Class handler for the #GtkEntry::move-cursor signal. The
* default implementation specifies the standard #GtkEntry cursor movement * default implementation specifies the standard #GtkEntry cursor movement
* behavior. * behavior.

23
gtk/gtktext.c
View File

@ -3839,30 +3839,9 @@ static void
gtk_text_real_activate (GtkText *self) gtk_text_real_activate (GtkText *self)
{ {
GtkTextPrivate *priv = gtk_text_get_instance_private (self); GtkTextPrivate *priv = gtk_text_get_instance_private (self);
GtkWindow *window;
GtkWidget *default_widget, *focus_widget;
GtkWidget *toplevel;
GtkWidget *widget;
widget = GTK_WIDGET (self);
if (priv->activates_default) if (priv->activates_default)
{ gtk_widget_activate_default (GTK_WIDGET (self));
toplevel = gtk_widget_get_toplevel (widget);
if (GTK_IS_WINDOW (toplevel))
{
window = GTK_WINDOW (toplevel);
if (window)
{
default_widget = gtk_window_get_default_widget (window);
focus_widget = gtk_root_get_focus (GTK_ROOT (window));
if (widget != default_widget &&
!(widget == focus_widget && (!default_widget || !gtk_widget_get_sensitive (default_widget))))
gtk_window_activate_default (window);
}
}
}
} }
static void static void

3
gtk/gtktextprivate.h
View File

@ -38,8 +38,7 @@ typedef struct _GtkTextClass GtkTextClass;
* non-%NULL, this will be called to add additional entries to the context * non-%NULL, this will be called to add additional entries to the context
* menu when it is displayed. * menu when it is displayed.
* @activate: Class handler for the #GtkText::activate signal. The default * @activate: Class handler for the #GtkText::activate signal. The default
* implementation calls gtk_window_activate_default() on the entry’s top-level * implementation activates the gtk.activate-default action.
* window.
* @move_cursor: Class handler for the #GtkText::move-cursor signal. The * @move_cursor: Class handler for the #GtkText::move-cursor signal. The
* default implementation specifies the standard #GtkText cursor movement * default implementation specifies the standard #GtkText cursor movement
* behavior. * behavior.