X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/d6a0064f2f7dc31499289094dc16b4d56152486b..6baf860c07c91b2209e4738f469248e7d8f4d6eb:/gdk/gdktypes.lisp

diff --git a/gdk/gdktypes.lisp b/gdk/gdktypes.lisp
index d73a08e..d07492e 100644
--- a/gdk/gdktypes.lisp
+++ b/gdk/gdktypes.lisp
@@ -15,11 +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.3 2001/05/11 16:17:21 espen Exp $
+;; $Id: gdktypes.lisp,v 1.8 2004/11/06 21:39:58 espen Exp $
 
 (in-package "GDK")
 
-(init-types-in-library "/opt/gnome/lib/libgdk-x11-1.3.so")
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (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
@@ -31,25 +41,26 @@
     :type unsigned-short)
    (green
     :allocation :alien
-    :accessor color-grenn
+    :accessor color-green
     :type unsigned-short)
    (blue
     :allocation :alien
     :accessor color-blue
     :type unsigned-short))
-  (:metaclass boxed-class))
-
+  (:metaclass boxed-class)
+  (:alien-name "GdkColor"))
 
 
-(define-types-by-introspection "Gdk"
-  ("GdkFunction" :type gc-function)
-  ("GdkGC" :type gc)
-  ("GdkDrawableImplX11" :ignore t)
-  ("GdkWindowImplX11" :ignore t)
-  ("GdkPixmapImplX11" :ignore t)
-  ("GdkGCX11" :ignore t)
-  ("GdkColor" :ignore t)
-  ("GdkEvent" :ignore t))
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (define-types-by-introspection "Gdk"
+    ("GdkFunction" :type gc-function)
+    ("GdkGC" :type gc)
+    ("GdkDrawableImplX11" :ignore t)
+    ("GdkWindowImplX11" :ignore t)
+    ("GdkPixmapImplX11" :ignore t)
+    ("GdkGCX11" :ignore t)
+    ("GdkColor" :ignore t)
+    ("GdkEvent" :ignore t)))
 
 
 (deftype bitmap () 'pixmap)
@@ -60,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))