From 9fee53684dd564559781eeb95d9bb551f0e8edfc Mon Sep 17 00:00:00 2001 From: Soeren Sandmann Date: Sat, 19 Jul 2003 20:24:33 +0000 Subject: [PATCH] remove leftover request of {xy}thickness Sat Jul 19 22:39:24 2003 Soeren Sandmann * gtk/gtktoolitem.c (gtk_tool_item_size_request): remove leftover request of {xy}thickness --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtktoolitem.c | 6 ++---- 6 files changed, 27 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 66a3d69faa..35d69bac80 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Jul 19 22:39:24 2003 Soeren Sandmann + + * gtk/gtktoolitem.c (gtk_tool_item_size_request): remove + leftover request of {xy}thickness + Sat Jul 19 16:26:02 2003 Soeren Sandmann * gtk/gtktoolbutton.c (gtk_tool_button_construct_contents): don't diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 66a3d69faa..35d69bac80 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sat Jul 19 22:39:24 2003 Soeren Sandmann + + * gtk/gtktoolitem.c (gtk_tool_item_size_request): remove + leftover request of {xy}thickness + Sat Jul 19 16:26:02 2003 Soeren Sandmann * gtk/gtktoolbutton.c (gtk_tool_button_construct_contents): don't diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 66a3d69faa..35d69bac80 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sat Jul 19 22:39:24 2003 Soeren Sandmann + + * gtk/gtktoolitem.c (gtk_tool_item_size_request): remove + leftover request of {xy}thickness + Sat Jul 19 16:26:02 2003 Soeren Sandmann * gtk/gtktoolbutton.c (gtk_tool_button_construct_contents): don't diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 66a3d69faa..35d69bac80 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sat Jul 19 22:39:24 2003 Soeren Sandmann + + * gtk/gtktoolitem.c (gtk_tool_item_size_request): remove + leftover request of {xy}thickness + Sat Jul 19 16:26:02 2003 Soeren Sandmann * gtk/gtktoolbutton.c (gtk_tool_button_construct_contents): don't diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 66a3d69faa..35d69bac80 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sat Jul 19 22:39:24 2003 Soeren Sandmann + + * gtk/gtktoolitem.c (gtk_tool_item_size_request): remove + leftover request of {xy}thickness + Sat Jul 19 16:26:02 2003 Soeren Sandmann * gtk/gtktoolbutton.c (gtk_tool_button_construct_contents): don't diff --git a/gtk/gtktoolitem.c b/gtk/gtktoolitem.c index b7658816e2..eb886cc448 100644 --- a/gtk/gtktoolitem.c +++ b/gtk/gtktoolitem.c @@ -362,8 +362,6 @@ gtk_tool_item_size_request (GtkWidget *widget, GtkRequisition *requisition) { GtkWidget *child = GTK_BIN (widget)->child; - gint xthickness = widget->style->xthickness; - gint ythickness = widget->style->ythickness; if (child && GTK_WIDGET_VISIBLE (child)) { @@ -375,8 +373,8 @@ gtk_tool_item_size_request (GtkWidget *widget, requisition->width = 0; } - requisition->width += (xthickness + GTK_CONTAINER (widget)->border_width) * 2; - requisition->height += (ythickness + GTK_CONTAINER (widget)->border_width) * 2; + requisition->width += (GTK_CONTAINER (widget)->border_width) * 2; + requisition->height += (GTK_CONTAINER (widget)->border_width) * 2; } static void