From 8155d4eb1c2717de283dc01902d8fcedefb36dd8 Mon Sep 17 00:00:00 2001 Message-Id: <8155d4eb1c2717de283dc01902d8fcedefb36dd8.1716882826.git.mdw@distorted.org.uk> From: Mark Wooding Date: Thu, 18 Oct 2007 10:55:34 +0000 Subject: [PATCH] Bug fix in DRAW-LAYOUT Organization: Straylight/Edgeware From: espen --- gdk/gdk.lisp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gdk/gdk.lisp b/gdk/gdk.lisp index a02267e..aa5ff27 100644 --- a/gdk/gdk.lisp +++ b/gdk/gdk.lisp @@ -20,7 +20,7 @@ ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -;; $Id: gdk.lisp,v 1.45 2007-10-17 18:04:47 espen Exp $ +;; $Id: gdk.lisp,v 1.46 2007-10-18 10:55:34 espen Exp $ (in-package "GDK") @@ -999,22 +999,20 @@ (defbinding draw-arc () nil (defbinding %draw-layout () nil (drawable drawable) (gc gc) - (font pango:font) (x int) (y int) (layout pango:layout)) (defbinding %draw-layout-with-colors () nil (drawable drawable) (gc gc) - (font pango:font) (x int) (y int) (layout pango:layout) (foreground (or null color)) (background (or null color))) -(defun draw-layout (drawable gc font x y layout &optional foreground background) +(defun draw-layout (drawable gc x y layout &optional foreground background) (if (or foreground background) - (%draw-layout-with-colors drawable gc font x y layout foreground background) - (%draw-layout drawable gc font x y layout))) + (%draw-layout-with-colors drawable gc x y layout foreground background) + (%draw-layout drawable gc x y layout))) (defbinding draw-drawable (drawable gc src src-x src-y dest-x dest-y &optional width height) nil -- [mdw]