Changes necessary to allow saving of core images with clg.

[clg] / gdk / gdktypes.lisp

diff --git a/gdk/gdktypes.lisp b/gdk/gdktypes.lisp
index f461140b9f71c322b5d3285f91f4317b8900b4e5..6cfbc7fb6b1d15a4cc1fee397cd2fc28a82220ad 100644 (file)
--- a/gdk/gdktypes.lisp
+++ b/gdk/gdktypes.lisp
@@ -15,17 +15,14 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 ;; 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.13 2005-02-10 00:22:35 espen Exp $
+;; $Id: gdktypes.lisp,v 1.16 2005-03-06 17:26:22 espen Exp $

 
 (in-package "GDK")
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (init-types-in-library #.(concatenate 'string
                            (pkg-config:pkg-variable "gtk+-2.0" "libdir")
 
 (in-package "GDK")
 
 (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_")
+                           "/libgdk-x11-2.0.so") :prefix ("gdk_" "_gdk_"))

   (init-types-in-library #.(concatenate 'string
                            (pkg-config:pkg-variable "gtk+-2.0" "libdir")
                            "/libgdk_pixbuf-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_"))


@@ -47,8 +44,7 @@ (defclass color (boxed)
     :allocation :alien
     :accessor color-blue
     :type unsigned-short))
     :allocation :alien
     :accessor color-blue
     :type unsigned-short))

-  (:metaclass boxed-class)
-  (:alien-name "GdkColor"))
+  (:metaclass boxed-class))

 
 
 (deftype point () '(vector int 2))
 
 
 (deftype point () '(vector int 2))


@@ -79,8 +75,7 @@ (defclass rectangle (boxed)
     :accessor rectangle-height
     :initarg :height
     :type int))
     :accessor rectangle-height
     :initarg :height
     :type int))

-  (:metaclass boxed-class)
-  (:alien-name "GdkRectangle"))
+  (:metaclass boxed-class))

 
 
 (define-types-by-introspection "Gdk"
 
 
 (define-types-by-introspection "Gdk"


@@ -99,7 +94,24 @@ (define-types-by-introspection "Gdk"
   ("GdkRectngle" :ignore t)
   ("GdkCursor" :ignore t)
   ("GdkFont" :ignore t) ; deprecated
   ("GdkRectngle" :ignore t)
   ("GdkCursor" :ignore t)
   ("GdkFont" :ignore t) ; deprecated

-  
+  ("GdkEventMask" :ignore t) ; manually defined
+
+  ("GdkDisplay"
+   :slots
+   ((name
+     :allocation :virtual
+     :getter "gdk_display_get_name"
+     :reader display-name
+     :type (copy-of string))
+    (screens
+     :allocation :virtual
+     :getter display-screens)
+    (devices
+     :allocation :virtual
+     :getter "gdk_display_list_devices"
+     :reader display-devices
+     :type (copy-of (glist device)))))
+

   ("GdkDrawable"
    :slots
    ((display
   ("GdkDrawable"
    :slots
    ((display


@@ -189,8 +201,7 @@ (defclass cursor (boxed)
     :getter "gdk_cursor_get_display"
     :reader cursor-display
     :type display))
     :getter "gdk_cursor_get_display"
     :reader cursor-display
     :type display))

-  (:metaclass boxed-class)
-  (:alien-name "GdkCursor"))
+  (:metaclass boxed-class))

 
 
 (defclass geometry (struct)
 
 
 (defclass geometry (struct)