From 158158ea0417a3c54496249a901dacec9337c8ab Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 9 Mar 2004 22:14:30 +0000 Subject: [PATCH] Avoid centering the label that is reparented from the menuitem. (#136614, Tue Mar 9 23:09:46 2004 Matthias Clasen * gtk/gtkoptionmenu.c (gtk_option_menu_init): Avoid centering the label that is reparented from the menuitem. (#136614, Dennis Cranston) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkoptionmenu.c | 8 +++++++- 6 files changed, 37 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index cbd588f036..3d63b3ebb7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Mar 9 23:09:46 2004 Matthias Clasen + + * gtk/gtkoptionmenu.c (gtk_option_menu_init): Avoid centering + the label that is reparented from the menuitem. (#136614, Dennis + Cranston) + Tue Mar 9 16:19:09 2004 Jonathan Blandford * gtk/gtkpathbar.c (struct _ButtonData): Encapsulate all of the diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index cbd588f036..3d63b3ebb7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Tue Mar 9 23:09:46 2004 Matthias Clasen + + * gtk/gtkoptionmenu.c (gtk_option_menu_init): Avoid centering + the label that is reparented from the menuitem. (#136614, Dennis + Cranston) + Tue Mar 9 16:19:09 2004 Jonathan Blandford * gtk/gtkpathbar.c (struct _ButtonData): Encapsulate all of the diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index cbd588f036..3d63b3ebb7 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Tue Mar 9 23:09:46 2004 Matthias Clasen + + * gtk/gtkoptionmenu.c (gtk_option_menu_init): Avoid centering + the label that is reparented from the menuitem. (#136614, Dennis + Cranston) + Tue Mar 9 16:19:09 2004 Jonathan Blandford * gtk/gtkpathbar.c (struct _ButtonData): Encapsulate all of the diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index cbd588f036..3d63b3ebb7 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Tue Mar 9 23:09:46 2004 Matthias Clasen + + * gtk/gtkoptionmenu.c (gtk_option_menu_init): Avoid centering + the label that is reparented from the menuitem. (#136614, Dennis + Cranston) + Tue Mar 9 16:19:09 2004 Jonathan Blandford * gtk/gtkpathbar.c (struct _ButtonData): Encapsulate all of the diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index cbd588f036..3d63b3ebb7 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Tue Mar 9 23:09:46 2004 Matthias Clasen + + * gtk/gtkoptionmenu.c (gtk_option_menu_init): Avoid centering + the label that is reparented from the menuitem. (#136614, Dennis + Cranston) + Tue Mar 9 16:19:09 2004 Jonathan Blandford * gtk/gtkpathbar.c (struct _ButtonData): Encapsulate all of the diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c index d3bbb02122..c13b9a2f17 100644 --- a/gtk/gtkoptionmenu.c +++ b/gtk/gtkoptionmenu.c @@ -1,5 +1,5 @@ /* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Jsh MacDonald * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -225,6 +225,12 @@ gtk_option_menu_init (GtkOptionMenu *option_menu) option_menu->menu_item = NULL; option_menu->width = 0; option_menu->height = 0; + /* + * Avoid centering the label that is reparented from the menuitem. + * Since gobject doesn't support overriding default values of + * properties in a convenient way yet, we simply set the value here. + */ + gtk_button_set_alignment (GTK_BUTTON (option_menu), 0.0, 0.5); } GtkWidget*