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

Drop gtk_window_activate_default

Browse Source 
This api has been replaced by an action that
can be activated with gtk_widget_activate_action.
This commit is contained in:
Matthias Clasen 2019-04-28 18:41:43 +00:00
parent 3d1fdf77dc
commit 0ae958d45b
3 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/reference/gtk/gtk4-sections.txt
View File

@ -4649,7 +4649,6 @@ gtk_window_set_resizable
gtk_window_get_resizable
gtk_window_add_accel_group
gtk_window_remove_accel_group
gtk_window_activate_default
gtk_window_set_modal
gtk_window_set_default_size
gtk_window_set_hide_on_close

31
gtk/gtkwindow.c
View File

@ -1778,7 +1778,7 @@ activate_default_cb (GSimpleAction *action,
GVariant *parameter,
gpointer data)
{
gtk_window_activate_default (GTK_WINDOW (data));
gtk_window_real_activate_default (GTK_WINDOW (data));
}
static void
@ -2906,31 +2906,16 @@ gtk_window_get_focus (GtkWindow *window)
return priv->focus_widget;
}
/**
* gtk_window_activate_default:
* @window: a #GtkWindow
*
* Activates the default widget for the window, unless the current
* focused widget has been configured to receive the default action
* (see gtk_widget_set_receives_default()), in which case the
* focused widget is activated.
*
* Returns: %TRUE if a widget got activated.
**/
gboolean
gtk_window_activate_default (GtkWindow *window)
static void
gtk_window_real_activate_default (GtkWindow *window)
{
GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
if (priv->default_widget && gtk_widget_is_sensitive (priv->default_widget) &&
(!priv->focus_widget || !gtk_widget_get_receives_default (priv->focus_widget)))
return gtk_widget_activate (priv->default_widget);
gtk_widget_activate (priv->default_widget);
else if (priv->focus_widget && gtk_widget_is_sensitive (priv->focus_widget))
return gtk_widget_activate (priv->focus_widget);
return FALSE;
gtk_widget_activate (priv->focus_widget);
}
/**
@ -6252,12 +6237,6 @@ get_active_region_type (GtkWindow *window, gint x, gint y)
return GTK_WINDOW_REGION_CONTENT;
}
static void
gtk_window_real_activate_default (GtkWindow *window)
{
gtk_window_activate_default (window);
}
static void
do_focus_change (GtkWidget *widget,
gboolean in)

2
gtk/gtkwindow.h
View File

@ -167,8 +167,6 @@ void gtk_window_set_default_widget (GtkWindow *window,
GtkWidget *default_widget);
GDK_AVAILABLE_IN_ALL
GtkWidget *gtk_window_get_default_widget (GtkWindow *window);
GDK_AVAILABLE_IN_ALL
gboolean gtk_window_activate_default (GtkWindow *window);
GDK_AVAILABLE_IN_ALL
void gtk_window_set_transient_for (GtkWindow *window,