[maemo-commits] [maemo-commits] r10037 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk

[From: subversion at stage.maemo.org]

Author: kris
Date: 2007-02-20 13:21:00 +0200 (Tue, 20 Feb 2007)
New Revision: 10037

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkcombobox.c
Log:
2007-02-20  Kristian Rietveld  <kris at imendio.com>

	Merge from upstream trunk:

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

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



Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-20 10:33:59 UTC (rev 10036)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-20 11:21:00 UTC (rev 10037)
@@ -1,3 +1,12 @@
+2007-02-20  Kristian Rietveld  <kris at imendio.com>
+
+	Merge from upstream trunk:
+
+    2006-12-15  Dom Lachowicz <domlachowicz at gmail.com>
+
+	* gtk/gtkcombobox.c: Make GtkComboBox in "appears-as-list" mode
+	more closely resemble its Win32 counterpart. Bug #340204.
+
 2007-02-20  Michael Natterer  <mitch at imendio.com>
 
 	* gtk/gtkmenuitem.c (gtk_menu_item_paint): clean up yesterday's

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkcombobox.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkcombobox.c	2007-02-20 10:33:59 UTC (rev 10036)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkcombobox.c	2007-02-20 11:21:00 UTC (rev 10037)
@@ -1354,7 +1354,7 @@
 #endif /* MAEMO_CHANGES */
 
           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);
 
@@ -1552,7 +1552,9 @@
   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);