AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-05 16:20:10 +00:00
Code Issues Projects Releases Wiki Activity

Remove merge conflicts

Browse Source
This commit is contained in:
Matthias Clasen 2010-08-10 07:43:26 -04:00
parent 70f65529a5
commit 8963e7cc46
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkexpander.c
View File

@ -669,7 +669,7 @@ gtk_expander_size_allocate (GtkWidget *widget,
label_allocation.y = widget->allocation.y + border_width + focus_width + focus_pad;
if (priv->fill_label)
if (priv->label_fill)
label_allocation.width = allocation->width - 2 * border_width -
expander_size - 2 * expander_spacing -
2 * focus_width - 2 * focus_pad;
@ -1770,10 +1770,6 @@ gtk_expander_get_label_widget (GtkExpander *expander)
return expander->priv->label_widget;
}
<<<<<<< HEAD
#define __GTK_EXPANDER_C__
#include "gtkaliasdef.c"
=======
/**
* gtk_expander_set_label_fill:
* @expander: a #GtkExpander
@ -1827,5 +1823,3 @@ gtk_expander_get_label_fill (GtkExpander *expander)
return expander->priv->label_fill;
}
>>>>>>> 79ef5de... Make it possible to make the expander label fill the entire space