diff options
Diffstat (limited to 'gtk/gtkwidget.c')
| -rw-r--r-- | gtk/gtkwidget.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 6ab93eb90b..3ddd36ac3e 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -505,7 +505,7 @@ struct _GtkWidgetPrivate SizeRequestCache requests; /* actions attached to this or any parent widget */ - GActionMuxer *muxer; + GtkActionMuxer *muxer; /* The widget's window or its parent window if it does * not have a window. (Which will be indicated by the @@ -15351,7 +15351,7 @@ void _gtk_widget_update_parent_muxer (GtkWidget *widget) { GtkWidget *parent; - GActionMuxer *parent_muxer; + GtkActionMuxer *parent_muxer; if (widget->priv->muxer == NULL) return; @@ -15363,15 +15363,15 @@ _gtk_widget_update_parent_muxer (GtkWidget *widget) parent_muxer = parent ? _gtk_widget_get_action_muxer (parent) : NULL; - g_action_muxer_set_parent (widget->priv->muxer, parent_muxer); + gtk_action_muxer_set_parent (widget->priv->muxer, parent_muxer); } -GActionMuxer * +GtkActionMuxer * _gtk_widget_get_action_muxer (GtkWidget *widget) { if (widget->priv->muxer == NULL) { - widget->priv->muxer = g_action_muxer_new (); + widget->priv->muxer = gtk_action_muxer_new (); _gtk_widget_update_parent_muxer (widget); } @@ -15396,7 +15396,7 @@ gtk_widget_insert_action_group (GtkWidget *widget, const gchar *name, GActionGroup *group) { - GActionMuxer *muxer; + GtkActionMuxer *muxer; g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (name != NULL); @@ -15404,9 +15404,9 @@ gtk_widget_insert_action_group (GtkWidget *widget, muxer = _gtk_widget_get_action_muxer (widget); if (group) - g_action_muxer_insert (muxer, name, group); + gtk_action_muxer_insert (muxer, name, group); else - g_action_muxer_remove (muxer, name); + gtk_action_muxer_remove (muxer, name); } /**************************************************************** |