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

Merge branch 'matthiasc/for-master' into 'master'

Browse Source 
widget: Remove a leftover vfunc

See merge request GNOME/gtk!1584
This commit is contained in:
Matthias Clasen 2020-03-30 11:37:57 +00:00
commit 61e88c7421
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk/gtkwidget.h
View File

@ -262,9 +262,6 @@ struct _GtkWidgetClass
gboolean (* keynav_failed) (GtkWidget *widget,
GtkDirectionType direction);
/* Signals used only for keybindings */
gboolean (* popup_menu) (GtkWidget *widget);
/* accessibility support
*/
AtkObject * (* get_accessible) (GtkWidget *widget);

13
gtk/gtkwindow.c
View File

@ -175,7 +175,6 @@ typedef struct
{
GtkWidget *attach_widget;
GtkWidget *default_widget;
GtkWidget *initial_focus;
GtkWidget *focus_widget;
GtkWindow *transient_parent;
GtkWindowGeometryInfo *geometry_info;
@ -2343,10 +2342,7 @@ gtk_window_get_focus (GtkWindow *window)
g_return_val_if_fail (GTK_IS_WINDOW (window), NULL);
if (priv->initial_focus)
return priv->initial_focus;
else
return priv->focus_widget;
return priv->focus_widget;
}
static void
@ -4156,12 +4152,7 @@ gtk_window_show (GtkWidget *widget)
gtk_widget_map (widget);
if (!priv->focus_widget)
{
if (priv->initial_focus)
gtk_window_set_focus (window, priv->initial_focus);
else
gtk_window_move_focus (widget, GTK_DIR_TAB_FORWARD);
}
gtk_window_move_focus (widget, GTK_DIR_TAB_FORWARD);
if (priv->modal)
gtk_grab_add (widget);