diff --git a/ChangeLog.n b/ChangeLog.n
index 2794a452701c3258555d2485d1dbce9d9eb8c65e..6622969747c6820697e59b1de7846f0b592ec8f6 100644
--- a/ChangeLog.n
+++ b/ChangeLog.n
@@ -3,6 +3,13 @@
 don't forget to change the version in utils/packages.lisp if you do anything
 user visible.
 *******************************************************************************
+2010-03-12  Andreas Fuchs  <afuchs@franz.com>
+
+	* aclpc/acl-widget.lisp: Make sure that mswin-combo-box-panes get
+	  the same treatment as hlist-panes do, as of 9e3990f267a. (spr36715)
+	* aclpc/acl-widget.lisp: Fix a parameter list mismatch introduced
+	  in 9e3990f267a (again, spr36715).
+
 2010-02-03  Andreas Fuchs  <afuchs@franz.com>
 
 	* tk-silica/xt-silica: Don't warn about missing fallback charsets
diff --git a/aclpc/acl-widget.lisp b/aclpc/acl-widget.lisp
index 859d374649999cb26fb6066b7968a30a595170cb..5859b41107fbef151e0bebefaa067cec1679cfbb 100644
--- a/aclpc/acl-widget.lisp
+++ b/aclpc/acl-widget.lisp
@@ -165,7 +165,7 @@
                 (setq w name-width))
                (t
                 (setq w (process-width-specification
-                         *default-list-pane-width*))))
+                         pane *default-list-pane-width*))))
          (when (member scroll-mode '(:vertical :both t :dynamic))
            ;; Allow for the vertical scrollbar
            (let ((wsty (win-scroll-thick :y)))
@@ -1434,7 +1434,8 @@
 	   sheet-permanently-enabled-mixin
 	   space-requirement-mixin
 	   basic-pane)
-  ()
+     ((x-margin :initform 0)
+      (y-margin :initform 0))
   (:default-initargs :background +white+))
 
 (defmethod initialize-instance :after ((sheet mswin-combo-box-pane)