Updated for gtk 2.0

[clg] / gdk / gdktypes.lisp

diff --git a/gdk/gdktypes.lisp b/gdk/gdktypes.lisp
index 8d158e578f94a8ce09f0e07e22137948489dbcea..a08da2e195d279b068321af19b1f6610b0653ff7 100644 (file)
--- a/gdk/gdktypes.lisp
+++ b/gdk/gdktypes.lisp
@@ -15,11 +15,13 @@
 ;; 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.7 2002-03-19 19:06:22 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 "libgdk-x11-2.0.so")
+  (init-types-in-library "libgdk_pixbuf-2.0.so"))
 
 (defclass color (boxed)
   ((pixel
@@ -31,25 +33,26 @@ (defclass color (boxed)
     :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)