Fixed a optionmenu bug where if you set a new menu on a optionmenu, the

selected widget would not get positioned correctly inside of the optionmenu.
-Jay

diff --git a/ChangeLog b/ChangeLog
index 131f840a56e76eced2dad4dba2172a8d5e0a4119..dcbc48a8c376b42b80ef1e374edd808732c4a4ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
+       * gtk/gtkoptionmenu.c: fixed a old bug where if you set a new 
+       menu for a optionmenu the widget would not get positioned correctly
+       inside of the optionmenu.
+
 Tue Dec 1 1997 Owen Taylor <owt1@cornell.edu>
        * glib/glib.h, glib/configure.in. Disabled gldouble, since
        it wasn't used anywhere and caused portability problems

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 131f840a56e76eced2dad4dba2172a8d5e0a4119..dcbc48a8c376b42b80ef1e374edd808732c4a4ef 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
+       * gtk/gtkoptionmenu.c: fixed a old bug where if you set a new 
+       menu for a optionmenu the widget would not get positioned correctly
+       inside of the optionmenu.
+
 Tue Dec 1 1997 Owen Taylor <owt1@cornell.edu>
        * glib/glib.h, glib/configure.in. Disabled gldouble, since
        it wasn't used anywhere and caused portability problems

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 131f840a56e76eced2dad4dba2172a8d5e0a4119..dcbc48a8c376b42b80ef1e374edd808732c4a4ef 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
+       * gtk/gtkoptionmenu.c: fixed a old bug where if you set a new 
+       menu for a optionmenu the widget would not get positioned correctly
+       inside of the optionmenu.
+
 Tue Dec 1 1997 Owen Taylor <owt1@cornell.edu>
        * glib/glib.h, glib/configure.in. Disabled gldouble, since
        it wasn't used anywhere and caused portability problems

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 131f840a56e76eced2dad4dba2172a8d5e0a4119..dcbc48a8c376b42b80ef1e374edd808732c4a4ef 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
+       * gtk/gtkoptionmenu.c: fixed a old bug where if you set a new 
+       menu for a optionmenu the widget would not get positioned correctly
+       inside of the optionmenu.
+
 Tue Dec 1 1997 Owen Taylor <owt1@cornell.edu>
        * glib/glib.h, glib/configure.in. Disabled gldouble, since
        it wasn't used anywhere and caused portability problems

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 131f840a56e76eced2dad4dba2172a8d5e0a4119..dcbc48a8c376b42b80ef1e374edd808732c4a4ef 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
+       * gtk/gtkoptionmenu.c: fixed a old bug where if you set a new 
+       menu for a optionmenu the widget would not get positioned correctly
+       inside of the optionmenu.
+
 Tue Dec 1 1997 Owen Taylor <owt1@cornell.edu>
        * glib/glib.h, glib/configure.in. Disabled gldouble, since
        it wasn't used anywhere and caused portability problems

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 131f840a56e76eced2dad4dba2172a8d5e0a4119..dcbc48a8c376b42b80ef1e374edd808732c4a4ef 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
+       * gtk/gtkoptionmenu.c: fixed a old bug where if you set a new 
+       menu for a optionmenu the widget would not get positioned correctly
+       inside of the optionmenu.
+
 Tue Dec 1 1997 Owen Taylor <owt1@cornell.edu>
        * glib/glib.h, glib/configure.in. Disabled gldouble, since
        it wasn't used anywhere and caused portability problems

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 131f840a56e76eced2dad4dba2172a8d5e0a4119..dcbc48a8c376b42b80ef1e374edd808732c4a4ef 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
+       * gtk/gtkoptionmenu.c: fixed a old bug where if you set a new 
+       menu for a optionmenu the widget would not get positioned correctly
+       inside of the optionmenu.
+
 Tue Dec 1 1997 Owen Taylor <owt1@cornell.edu>
        * glib/glib.h, glib/configure.in. Disabled gldouble, since
        it wasn't used anywhere and caused portability problems

diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c
index 919aa266924b44678c3150e4eacc0d531ceae713..493351d06d9e658619aefe23a215e044ae6c59b3 100644 (file)
--- a/gtk/gtkoptionmenu.c
+++ b/gtk/gtkoptionmenu.c
@@ -446,6 +446,7 @@ gtk_option_menu_update_contents (GtkOptionMenu *option_menu)
              gtk_container_unblock_resize (GTK_CONTAINER (option_menu));
            }
 
+         gtk_widget_size_request (child, &child->requisition);
          gtk_widget_size_allocate (GTK_WIDGET (option_menu),
                                    &(GTK_WIDGET (option_menu)->allocation));