X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/112ac1d33aa8f9b7f3d2f9542d15431f152b1d35..90c5d56bea07587dc74d4424bfba46d3ae8a8e47:/gdk/gdktypes.lisp

diff --git a/gdk/gdktypes.lisp b/gdk/gdktypes.lisp
index 01ddf68..07a303b 100644
--- 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.19 2005-04-23 16:48:50 espen Exp $
+;; $Id: gdktypes.lisp,v 1.23 2006-04-10 18:16:24 espen Exp $
 
 (in-package "GDK")
 
@@ -36,19 +36,19 @@
 (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))
 
 
@@ -83,6 +83,8 @@
   (:metaclass boxed-class))
 
 
+
+
 (define-types-by-introspection "Gdk"
   ("GdkFunction" :type gc-function)
   ("GdkWMDecoration" :type wm-decoration)
@@ -96,10 +98,11 @@
   ("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
+  ("GdkModifierType" :ignore t) ; manually defined
 
   ("GdkDisplay"
    :slots
@@ -266,3 +269,10 @@
     :initarg :gravity
     :type gravity))
   (:metaclass struct-class))
+
+(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))