Bug fixes

[clg] / cairo / cairo.lisp

diff --git a/cairo/cairo.lisp b/cairo/cairo.lisp
index acff762c3d0d8ebc783a351ccbd04a63b8b86e9d..294f3d5b571ac1c003294c16f7b75632aa8310d9 100644 (file)
--- a/cairo/cairo.lisp
+++ b/cairo/cairo.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: cairo.lisp,v 1.1 2005/11/10 08:50:45 espen Exp $
+;; $Id: cairo.lisp,v 1.3 2006/02/07 17:04:40 espen Exp $
 
 (in-package "CAIRO")
 
@@ -52,7 +52,7 @@   (define-enum-type subpixel-order :default :rgb :bgr :vrgb :vbgr)
   (define-enum-type hint-style :default :none :slight :medium :full)
   (define-enum-type hint-metrics :default :off :on)
 
-  (defclass glyph (proxy)
+  (defclass glyph (struct)
     ((index 
       :allocation :alien 
       :initarg :index 
@@ -339,7 +339,7 @@        (defun ,name (cr &optional preserve)
             (,pname cr)
           (,iname cr)))
        ,(unless clip-p
-         (let ((tname (intern (format nil "IN~A-P" name)))
+         (let ((tname (intern (format nil "IN-~A-P" name)))
                (ename (intern (format nil "~A-EXTENTS" name))))
            `(progn
               (defbinding ,tname () boolean
@@ -649,7 +649,7 @@ (defbinding %font-options-destroy () nil
   (location pointer))
 
 (defmethod reference-foreign ((class (eql (find-class 'font-options))) location)
-  (%font-options-reference location))
+  (%font-options-copy location))
 
 (defmethod unreference-foreign ((class (eql (find-class 'font-options))) location)
   (%font-options-destroy location))