X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/ceebb351fb60b14d176efffa22bc38d0df29c6af..1ff84b0665062c842c5eb53c91d69c68249c87b5:/gdk/gdktypes.lisp

diff --git a/gdk/gdktypes.lisp b/gdk/gdktypes.lisp
index 68be4b9..bbc2f96 100644
--- 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.6 2002-01-20 14:14:38 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 "libgdk-x11-1.3.so")
-  (init-types-in-library "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
@@ -63,11 +71,8 @@
     :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))