Custom types are now re-registered when a saved image is loaded

[clg] / gdk / gdktypes.lisp

diff --git a/gdk/gdktypes.lisp b/gdk/gdktypes.lisp
index 1335c231e15f951b9ae9b8155f6ab4e5b668f631..ee47e2e58b41fad1e0fed3d2ae6abed35ecb8057 100644 (file)
--- a/gdk/gdktypes.lisp
+++ b/gdk/gdktypes.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: gdktypes.lisp,v 1.20 2005/04/24 13:29:36 espen Exp $
+;; $Id: gdktypes.lisp,v 1.23 2006/04/10 18:16:24 espen Exp $
 
 (in-package "GDK")
 
@@ -36,19 +36,19 @@ (eval-when (:compile-toplevel :load-toplevel :execute)
 (defclass color (boxed)
   ((pixel
     :allocation :alien
-    :type unsigned-long)
+    :type (unsigned 32))
    (red
     :allocation :alien
     :accessor color-red
-    :type unsigned-short)
+    :type (unsigned 16))
    (green
-    :allocation :alien
+    :allocation :alien :offset 6
     :accessor color-green
-    :type unsigned-short)
+    :type (unsigned 16))
    (blue
-    :allocation :alien
+    :allocation :alien  :offset 8
     :accessor color-blue
-    :type unsigned-short))
+    :type (unsigned 16)))
   (:metaclass boxed-class))
 
 
@@ -98,7 +98,7 @@ (define-types-by-introspection "Gdk"
   ("GdkGCX11" :ignore t)
   ("GdkColor" :ignore t)
   ("GdkEvent" :ignore t)
-  ("GdkRectngle" :ignore t)
+  ("GdkRectangle" :ignore t)
   ("GdkCursor" :ignore t)
   ("GdkFont" :ignore t) ; deprecated
   ("GdkEventMask" :ignore t) ; manually defined
@@ -274,3 +274,5 @@ (define-flags-type modifier-type
   :shift :lock :control :mod1 :mod2 :mod3 :mod4 :mod5 
   :button1 :button2 :button3 :button4 :button5
   (:release #.(ash 1 30)))
+
+(deftype native-window () '(unsigned 32))