Major cleanup of ffi abstraction layer

[clg] / gdk / gdktypes.lisp

diff --git a/gdk/gdktypes.lisp b/gdk/gdktypes.lisp
index 87e2aa3dc59c0339072c99d604d7b467fed0f719..bbc2f9608a5171174e64d5bb4fbdec1370deeddc 100644 (file)
--- a/gdk/gdktypes.lisp
+++ b/gdk/gdktypes.lisp
@@ -15,13 +15,21 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-;; $Id: gdktypes.lisp,v 1.4 2001-05-29 15:53:32 espen Exp $
+;; $Id: gdktypes.lisp,v 1.8 2004-11-06 21:39:58 espen Exp $
 
 (in-package "GDK")
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (init-types-in-library "/opt/gnome/lib/libgdk-x11-1.3.so")
-  (init-types-in-library "/opt/gnome/lib/libgdk_pixbuf-1.3.so"))
+  (init-types-in-library #.(concatenate 'string
+                           (pkg-config:pkg-variable "gtk+-2.0" "libdir")
+                           "/libgdk-x11-2.0.so") :prefix "gdk_")
+  (init-types-in-library #.(concatenate 'string
+                           (pkg-config:pkg-variable "gtk+-2.0" "libdir")
+                           "/libgdk-x11-2.0.so") :prefix "_gdk_")
+  (init-types-in-library #.(concatenate 'string
+                           (pkg-config:pkg-variable "gtk+-2.0" "libdir")
+                           "/libgdk_pixbuf-2.0.so") :prefix "gdk_"))
+
 
 (defclass color (boxed)
   ((pixel
@@ -33,7 +41,7 @@ (defclass color (boxed)
     :type unsigned-short)
    (green
     :allocation :alien
-    :accessor color-grenn
+    :accessor color-green
     :type unsigned-short)
    (blue
     :allocation :alien
@@ -63,11 +71,8 @@ (defclass cursor (struct)
     :accessor cursor-type
     :initarg :type
     :type cursor-type))
-  (:metaclass proxy-class)
-  (:copy %cursor-copy)
-  (:free %cursor-free))
+  (:metaclass struct-class))
 
 (defclass device (struct)
   ()
-  (:metaclass proxy-class))
-
+  (:metaclass struct-class))