Definition of EVENT-MASK moved to gdktypes.lisp and some other minor changes

[clg] / gdk / gdktypes.lisp

diff --git a/gdk/gdktypes.lisp b/gdk/gdktypes.lisp
index bcd5ed7e77ba00419db21ac83f7c964cc60f3634..07a303b3709eba3d7a65f96b78160ca3b913b330 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.21 2006-01-30 15:40:16 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 :offset 6
     :accessor color-green
-    :type unsigned-short)
+    :type (unsigned 16))
    (blue
     :allocation :alien  :offset 8
     :accessor color-blue
-    :type unsigned-short))
+    :type (unsigned 16)))
   (:metaclass boxed-class))
 
 
@@ -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))