From: espen Date: Thu, 18 Oct 2007 10:55:34 +0000 (+0000) Subject: Bug fix in DRAW-LAYOUT X-Git-Tag: clg-0-93~57 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/commitdiff_plain/7cef9b21c7d07c4ed494cdb96260b36284ba979d Bug fix in DRAW-LAYOUT --- diff --git a/gdk/gdk.lisp b/gdk/gdk.lisp index b9af373..4012b61 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