diff --git a/ChangeLog b/ChangeLog
index cac78065bd..a845af3477 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-03-08  Alberto Ruiz  <aruiz@gnome.org>
+
+	* modules/engines/ms-windows/msw_style.c (draw_shadow):
+	Do not draw frame if parent if combobox.
+	(draw_box):
+	Uses scrollbar width system metrics for combobox button.
+	Fixes #461805 for XP theme engine.
+
 2008-03-07  Johan Dahlin  <johan@gnome.org>
 
 	* gtk/gtkbuilder.c:
diff --git a/modules/engines/ms-windows/msw_style.c b/modules/engines/ms-windows/msw_style.c
index 9c11b75bfc..3f4dcb377a 100755
--- a/modules/engines/ms-windows/msw_style.c
+++ b/modules/engines/ms-windows/msw_style.c
@@ -1980,7 +1980,7 @@ draw_box (GtkStyle *style,
       FillRect (dc, &rect, GetSysColorBrush (COLOR_WINDOW));
       release_window_dc (style, window, state_type);
 
-      cx = 2 * GetSystemMetrics (SM_CXEDGE) + 16;	/* TODO evaluate arrow width */
+      cx = GetSystemMetrics(SM_CXVSCROLL);
       x += width - cx;
       width = cx;
 
@@ -2946,8 +2946,13 @@ draw_shadow (GtkStyle *style,
 
   if (detail && !strcmp (detail, "frame"))
     {
+ 
       HDC dc;
       RECT rect;
+
+      if (is_combo_box_child (widget))
+        return; 
+
       dc = get_window_dc (style, window, state_type, x, y, width, height, &rect);
 
       if (is_popup_window_child (widget))