callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

action bar: Use a regular box instead of GtkCenterBox

Browse Source 
GtkBox now supports a centered child, so GtkCenterBox is
no longer needed here.
This commit is contained in:
Matthias Clasen 2014-02-16 23:02:05 -05:00
parent 06716a6c79
commit ef565e2713
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/gtkactionbar.c
View File

@ -24,7 +24,7 @@
#include "gtkaccessible.h" #include "gtkaccessible.h"
#include "gtkbuildable.h" #include "gtkbuildable.h"
#include "gtktypebuiltins.h" #include "gtktypebuiltins.h"
#include "gtkcenterbox.h" #include "gtkbox.h"
#include "gtkrevealer.h" #include "gtkrevealer.h"
#include <string.h> #include <string.h>
@ -253,7 +253,7 @@ gtk_action_bar_buildable_add_child (GtkBuildable *buildable,
GtkActionBarPrivate *priv = gtk_action_bar_get_instance_private (action_bar); GtkActionBarPrivate *priv = gtk_action_bar_get_instance_private (action_bar);
if (type && strcmp (type, "center") == 0) if (type && strcmp (type, "center") == 0)
gtk_center_box_set_center_widget (GTK_CENTER_BOX (priv->center_box), GTK_WIDGET (child)); gtk_box_set_center_widget (GTK_BOX (priv->center_box), GTK_WIDGET (child));
else if (!type) else if (!type)
gtk_container_add (GTK_CONTAINER (buildable), GTK_WIDGET (child)); gtk_container_add (GTK_CONTAINER (buildable), GTK_WIDGET (child));
else else
@ -285,7 +285,7 @@ gtk_action_bar_pack_start (GtkActionBar *action_bar,
{ {
GtkActionBarPrivate *priv = gtk_action_bar_get_instance_private (action_bar); GtkActionBarPrivate *priv = gtk_action_bar_get_instance_private (action_bar);
gtk_center_box_pack_start (GTK_CENTER_BOX (priv->center_box), child); gtk_box_pack_start (GTK_BOX (priv->center_box), child, FALSE, TRUE, 0);
} }
/** /**
@ -304,7 +304,7 @@ gtk_action_bar_pack_end (GtkActionBar *action_bar,
{ {
GtkActionBarPrivate *priv = gtk_action_bar_get_instance_private (action_bar); GtkActionBarPrivate *priv = gtk_action_bar_get_instance_private (action_bar);
gtk_center_box_pack_end (GTK_CENTER_BOX (priv->center_box), child); gtk_box_pack_end (GTK_BOX (priv->center_box), child, FALSE, TRUE, 0);
} }
/** /**
@ -322,8 +322,7 @@ gtk_action_bar_set_center_widget (GtkActionBar *action_bar,
{ {
GtkActionBarPrivate *priv = gtk_action_bar_get_instance_private (action_bar); GtkActionBarPrivate *priv = gtk_action_bar_get_instance_private (action_bar);
gtk_center_box_set_center_widget (GTK_CENTER_BOX (priv->center_box), gtk_box_set_center_widget (GTK_BOX (priv->center_box), center_widget);
center_widget);
} }
/** /**
@ -343,7 +342,7 @@ gtk_action_bar_get_center_widget (GtkActionBar *action_bar)
g_return_val_if_fail (GTK_IS_ACTION_BAR (action_bar), NULL); g_return_val_if_fail (GTK_IS_ACTION_BAR (action_bar), NULL);
return gtk_center_box_get_center_widget (GTK_CENTER_BOX (priv->center_box)); return gtk_box_get_center_widget (GTK_BOX (priv->center_box));
} }
/** /**

3
gtk/resources/ui/gtkactionbar.ui
View File

@ -8,8 +8,9 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<child> <child>
<object class="GtkCenterBox" id="center_box"> <object class="GtkBox" id="center_box">
<property name="visible">True</property> <property name="visible">True</property>
<property name="orientation">horizontal</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="border_width">0</property> <property name="border_width">0</property>
<property name="spacing">6</property> <property name="spacing">6</property>