toolbareditor: use GtkBox instead of H/V versions

Bug #661240
This commit is contained in:
Diego Escalante Urrelo 2011-10-07 23:46:04 +00:00 committed by Felix Riemann
parent 1a382d8fcf
commit ada6e43cc9
4 changed files with 13 additions and 9 deletions

View file

@ -84,7 +84,7 @@ struct _EggEditableToolbarPrivate
gchar *primary_name;
};
G_DEFINE_TYPE (EggEditableToolbar, egg_editable_toolbar, GTK_TYPE_VBOX);
G_DEFINE_TYPE (EggEditableToolbar, egg_editable_toolbar, GTK_TYPE_BOX);
static int
get_dock_position (EggEditableToolbar *etoolbar,
@ -1061,7 +1061,7 @@ create_dock (EggEditableToolbar *etoolbar)
{
GtkWidget *toolbar, *hbox;
hbox = gtk_hbox_new (0, FALSE);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
toolbar = gtk_toolbar_new ();
gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), TRUE);
@ -1416,6 +1416,8 @@ egg_editable_toolbar_init (EggEditableToolbar *etoolbar)
priv = etoolbar->priv = EGG_EDITABLE_TOOLBAR_GET_PRIVATE (etoolbar);
gtk_orientable_set_orientation (GTK_ORIENTABLE (etoolbar),
GTK_ORIENTATION_VERTICAL);
priv->save_hidden = TRUE;
g_signal_connect (etoolbar, "notify::visible",
@ -1859,7 +1861,7 @@ new_separator_pixbuf (void)
GtkWidget *separator;
GdkPixbuf *pixbuf;
separator = gtk_vseparator_new ();
separator = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
pixbuf = new_pixbuf_from_widget (separator);
return pixbuf;
}

View file

@ -41,7 +41,7 @@ typedef struct _EggEditableToolbarClass EggEditableToolbarClass;
struct _EggEditableToolbar
{
GtkVBox parent_object;
GtkBox parent_object;
/*< private >*/
EggEditableToolbarPrivate *priv;
@ -49,7 +49,7 @@ struct _EggEditableToolbar
struct _EggEditableToolbarClass
{
GtkVBoxClass parent_class;
GtkBoxClass parent_class;
void (* action_request) (EggEditableToolbar *etoolbar,
const char *action_name);

View file

@ -71,7 +71,7 @@ struct EggToolbarEditorPrivate
gulong sig_handlers[SIGNAL_HANDLER_LIST_SIZE];
};
G_DEFINE_TYPE (EggToolbarEditor, egg_toolbar_editor, GTK_TYPE_VBOX);
G_DEFINE_TYPE (EggToolbarEditor, egg_toolbar_editor, GTK_TYPE_BOX);
static gint
compare_items (gconstpointer a,
@ -456,7 +456,7 @@ editor_create_item (EggToolbarEditor *editor,
G_CALLBACK (drag_end_cb), NULL);
}
vbox = gtk_vbox_new (0, FALSE);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show (vbox);
gtk_container_add (GTK_CONTAINER (event_box), vbox);
@ -667,6 +667,8 @@ egg_toolbar_editor_init (EggToolbarEditor *t)
{
t->priv = EGG_TOOLBAR_EDITOR_GET_PRIVATE (t);
gtk_orientable_set_orientation (GTK_ORIENTABLE (t),
GTK_ORIENTATION_VERTICAL);
t->priv->manager = NULL;
t->priv->actions_list = NULL;

View file

@ -40,7 +40,7 @@ typedef struct EggToolbarEditorPrivate EggToolbarEditorPrivate;
struct EggToolbarEditor
{
GtkVBox parent_object;
GtkBox parent_object;
/*< private >*/
EggToolbarEditorPrivate *priv;
@ -48,7 +48,7 @@ struct EggToolbarEditor
struct EggToolbarEditorClass
{
GtkVBoxClass parent_class;
GtkBoxClass parent_class;
};