Make GtkComboBox in "appears-as-list" mode more closely resemble its Win32

2006-12-15  Dom Lachowicz <domlachowicz@gmail.com>

        * gtk/gtkcombobox.c: Make GtkComboBox in "appears-as-list" mode
        more closely resemble its Win32 counterpart. Bug #340204.

diff --git a/ChangeLog b/ChangeLog
index 6a53cbf242c39cde9f87f2d87f4ac5d4946dcef4..a302da793be826e1516bd4c135930125b77a7c18 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-15  Dom Lachowicz <domlachowicz@gmail.com>
+
+       * gtk/gtkcombobox.c: Make GtkComboBox in "appears-as-list" mode
+       more closely resemble its Win32 counterpart. Bug #340204.
+
 2006-12-14  Carlos Garnacho  <carlosg@gnome.org>
 
        * gtk/gtkcalendar.c: draw arrows pointing to the right correctly

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index c1d2bdd946c5a2006870ffb17bdb39bda074bc72..900b931b453b147d745b3f24c55afcc7e70c3004 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -1288,7 +1288,7 @@ gtk_combo_box_set_popup_widget (GtkComboBox *combo_box,
 
           combo_box->priv->popup_frame = gtk_frame_new (NULL);
           gtk_frame_set_shadow_type (GTK_FRAME (combo_box->priv->popup_frame),
-                                     GTK_SHADOW_ETCHED_IN);
+                                     GTK_SHADOW_NONE);
           gtk_container_add (GTK_CONTAINER (combo_box->priv->popup_window),
                              combo_box->priv->popup_frame);
 
@@ -1486,7 +1486,9 @@ gtk_combo_box_list_position (GtkComboBox *combo_box,
   GtkRequisition popup_req;
   GtkPolicyType hpolicy, vpolicy;
   
-  sample = GTK_BIN (combo_box)->child;
+  /* under windows, the drop down list is as wide as the combo box itself.
+     see bug #340204 */
+  sample = combo_box;
 
   gdk_window_get_origin (sample->window, x, y);