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

Add a checkbox to queue an merge/unmerge. Patch from Matthias Clasen.

Browse Source 
Sat Jun  5 20:05:39 2004  Soeren Sandmann  <sandmann@daimi.au.dk>

	* tests/testmerge.c: Add a checkbox to queue an
	merge/unmerge. Patch from Matthias Clasen.

	* gtk/gtktoolbar.c (struct _GtkToolbarPrivate): Add a new flag
	"need_rebuild"
	(rebuild_menu): New function that rebuilds the overflow menu and
	makes sure it doesn't start or end with a separator.
	(toolbar_content_new_tool_item)
	(toolbar_content_remove)
	(toolbar_content_new_compatibility): Set the rebuild_needed flag
	(gtk_toolbar_size_allocate): Only show the overflow arrow when we
	have actually overflown an item with a proxy menu item. Also make
	sure we rebuild the menu if needed.

	Fix #125504, #142377, #143463

	* gtk/gtkseparatortoolitem.c (gtk_separator_tool_item_expose):
	Obey the "priv->draw" flag. (#143692)
This commit is contained in:
Soeren Sandmann
2004-06-05 18:24:53 +00:00
committed by Søren Sandmann Pedersen
parent bb376968cf
commit e47c0d46b1
7 changed files with 244 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/gtkseparatortoolitem.c
View File

@ -229,12 +229,17 @@ gtk_separator_tool_item_expose (GtkWidget *widget,
GdkEventExpose *event)
{
GtkToolbar *toolbar = NULL;
GtkSeparatorToolItemPrivate *priv =
GTK_SEPARATOR_TOOL_ITEM_GET_PRIVATE (widget);
if (widget->parent && GTK_IS_TOOLBAR (widget->parent))
toolbar = GTK_TOOLBAR (widget->parent);
if (priv->draw)
{
if (widget->parent && GTK_IS_TOOLBAR (widget->parent))
toolbar = GTK_TOOLBAR (widget->parent);
_gtk_toolbar_paint_space_line (widget, toolbar,
&(event->area), &widget->allocation);
_gtk_toolbar_paint_space_line (widget, toolbar,
&(event->area), &widget->allocation);
}
return FALSE;
}