AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

make show_arrow default to TRUE; ignore the property when api_mode !=

Browse Source 
Thu Jul 31 23:09:02 2003  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gtk/gtktoolbar.c (gtk_toolbar_class_init): make show_arrow
	default to TRUE; ignore the property when api_mode != NEW_API
This commit is contained in:
Soeren Sandmann 2003-07-31 20:49:48 +00:00 committed by Søren Sandmann Pedersen
parent 5e79f817bd
commit d047149856
6 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu Jul 31 23:09:02 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (gtk_toolbar_class_init): make show_arrow
default to TRUE; ignore the property when api_mode != NEW_API
2003-07-31 Matthias Clasen <maclas@gmx.de> 2003-07-31 Matthias Clasen <maclas@gmx.de>
* gtk/gtkwindow.c (gtk_window_set_default_icon): Rename parameter pixbuf to icon, to * gtk/gtkwindow.c (gtk_window_set_default_icon): Rename parameter pixbuf to icon, to

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
Thu Jul 31 23:09:02 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (gtk_toolbar_class_init): make show_arrow
default to TRUE; ignore the property when api_mode != NEW_API
2003-07-31 Matthias Clasen <maclas@gmx.de> 2003-07-31 Matthias Clasen <maclas@gmx.de>
* gtk/gtkwindow.c (gtk_window_set_default_icon): Rename parameter pixbuf to icon, to * gtk/gtkwindow.c (gtk_window_set_default_icon): Rename parameter pixbuf to icon, to

5
ChangeLog.pre-2-4
View File

@ -1,3 +1,8 @@
Thu Jul 31 23:09:02 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (gtk_toolbar_class_init): make show_arrow
default to TRUE; ignore the property when api_mode != NEW_API
2003-07-31 Matthias Clasen <maclas@gmx.de> 2003-07-31 Matthias Clasen <maclas@gmx.de>
* gtk/gtkwindow.c (gtk_window_set_default_icon): Rename parameter pixbuf to icon, to * gtk/gtkwindow.c (gtk_window_set_default_icon): Rename parameter pixbuf to icon, to

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
Thu Jul 31 23:09:02 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (gtk_toolbar_class_init): make show_arrow
default to TRUE; ignore the property when api_mode != NEW_API
2003-07-31 Matthias Clasen <maclas@gmx.de> 2003-07-31 Matthias Clasen <maclas@gmx.de>
* gtk/gtkwindow.c (gtk_window_set_default_icon): Rename parameter pixbuf to icon, to * gtk/gtkwindow.c (gtk_window_set_default_icon): Rename parameter pixbuf to icon, to

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
Thu Jul 31 23:09:02 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (gtk_toolbar_class_init): make show_arrow
default to TRUE; ignore the property when api_mode != NEW_API
2003-07-31 Matthias Clasen <maclas@gmx.de> 2003-07-31 Matthias Clasen <maclas@gmx.de>
* gtk/gtkwindow.c (gtk_window_set_default_icon): Rename parameter pixbuf to icon, to * gtk/gtkwindow.c (gtk_window_set_default_icon): Rename parameter pixbuf to icon, to

8
gtk/gtktoolbar.c
View File

@ -380,7 +380,7 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
g_param_spec_boolean ("show_arrow", g_param_spec_boolean ("show_arrow",
_("Show Arrow"), _("Show Arrow"),
_("If an arrow should be shown if the toolbar doesn't fit"), _("If an arrow should be shown if the toolbar doesn't fit"),
FALSE, TRUE,
G_PARAM_READWRITE)); G_PARAM_READWRITE));
/* child properties */ /* child properties */
@ -530,7 +530,7 @@ gtk_toolbar_init (GtkToolbar *toolbar)
priv->drag_highlight = NULL; priv->drag_highlight = NULL;
priv->menu = NULL; priv->menu = NULL;
priv->show_arrow = TRUE;
priv->settings = NULL; priv->settings = NULL;
} }
@ -843,7 +843,7 @@ gtk_toolbar_size_request (GtkWidget *widget,
pack_front_size += size; pack_front_size += size;
} }
if (priv->show_arrow) if (priv->show_arrow && priv->api_mode == NEW_API)
{ {
gtk_widget_size_request (priv->arrow_button, &arrow_requisition); gtk_widget_size_request (priv->arrow_button, &arrow_requisition);
@ -1014,7 +1014,7 @@ gtk_toolbar_size_allocate (GtkWidget *widget,
needed_size += get_item_size (toolbar, GTK_WIDGET (item)); needed_size += get_item_size (toolbar, GTK_WIDGET (item));
} }
need_arrow = (needed_size > available_size) && priv->show_arrow; need_arrow = (needed_size > available_size) && priv->show_arrow && priv->api_mode == NEW_API;
if (need_arrow) if (need_arrow)
size = available_size - arrow_size; size = available_size - arrow_size;