Automatic definition of EVENT-MASK overridden with manual definition

diff --git a/examples/testgtk.lisp b/examples/testgtk.lisp
index 6393fdea95d67677bfcb29804cbb00d6c40686cd..82ee939ed68ea1a00bc0cc2da19742af6c815445 100644 (file)
--- a/examples/testgtk.lisp
+++ b/examples/testgtk.lisp
@@ -15,7 +15,7 @@
 ;; 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: testgtk.lisp,v 1.18 2005-02-25 23:58:56 espen Exp $
+;; $Id: testgtk.lisp,v 1.19 2005-02-26 10:44:11 espen Exp $
 
 
 ;(use-package "GTK")
@@ -327,7 +327,7 @@ (define-simple-dialog create-cursors (dialog "Cursors")
                               2 10 0)))
        (drawing-area (make-instance 'drawing-area
                       :width-request 80 :height-request 80
-                      :events '(:exposure-mask :button-press-mask)))
+                      :events '(:exposure :button-press)))
        (label (make-instance 'label :label "XXX")))
 
     (signal-connect drawing-area 'expose-event #'cursor-expose :object t)
@@ -565,7 +565,7 @@ (define-toplevel create-layout (window "Layout" :default-width 200
                                                :default-height 200)
   (let ((layout (make-instance 'layout
                 :parent (make-instance 'scrolled-window :parent window)
-                :width 1600 :height 128000 :events '(:exposure-mask)
+                :width 1600 :height 128000 :events '(:exposure)
                 :signal (list 'expose-event #'layout-expose :object t))))
 
     (with-slots (hadjustment vadjustment) layout
@@ -1039,13 +1039,7 @@ (define-simple-dialog create-reparent (dialog "Reparent")
 
 (define-toplevel create-rulers (window "Rulers" 
                                :default-width 300 :default-height 300
-;;                             :events '(:pointer-motion-mask 
-;;                                       :pointer-motion-hint-mask)
-                               )
-  (setf 
-   (widget-events window) 
-   '(:pointer-motion-mask :pointer-motion-hint-mask))
-
+                               :events '(:pointer-motion :pointer-motion-hint))
   (let ((table (make-instance 'table :n-rows 2 :n-columns 2 :parent window))
        (h-ruler (make-instance 'h-ruler
                  :metric :centimeters :lower 100.0d0 :upper 0.0d0

diff --git a/gdk/gdkevents.lisp b/gdk/gdkevents.lisp
index d4ccd58801b3affd70b3c8d8a1d52439ede09356..ee8e9f96dd2502275946f1448928f567c11b5ff6 100644 (file)
--- a/gdk/gdkevents.lisp
+++ b/gdk/gdkevents.lisp
@@ -15,16 +15,40 @@
 ;; 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: gdkevents.lisp,v 1.6 2004-12-20 00:09:57 espen Exp $
+;; $Id: gdkevents.lisp,v 1.7 2005-02-26 10:44:09 espen Exp $
 
 (in-package "GDK")
 
 
-(defvar *event-classes* (make-hash-table))
+(define-flags-type event-mask
+  (:exposure 2)
+  :pointer-motion
+  :pointer-motion-hint
+  :button-motion
+  :button1-motion
+  :button2-motion
+  :button3-motion
+  :button-press
+  :button-release
+  :key-press
+  :key-release
+  :enter-notify
+  :leave-notify
+  :focus-change
+  :structure
+  :property-change
+  :visibility-notify
+  :proximity-in
+  :proximity-out
+  :substructure
+  :scroll
+  (:all-events #x3FFFFE))
 
 
 ;;;; Metaclass for event classes
 
+(defvar *event-classes* (make-hash-table))
+
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defclass event-class (boxed-class)
     ((event-type :reader event-class-type)))

diff --git a/gdk/gdktypes.lisp b/gdk/gdktypes.lisp
index f461140b9f71c322b5d3285f91f4317b8900b4e5..414fb27d1d857e916e1b16a923fdd93e5bbf621b 100644 (file)
--- a/gdk/gdktypes.lisp
+++ b/gdk/gdktypes.lisp
@@ -15,7 +15,7 @@
 ;; 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.14 2005-02-26 10:44:09 espen Exp $
 
 (in-package "GDK")
 
@@ -99,7 +99,8 @@ (define-types-by-introspection "Gdk"
   ("GdkRectngle" :ignore t)
   ("GdkCursor" :ignore t)
   ("GdkFont" :ignore t) ; deprecated
-  
+  ("GdkEventMask" :ignore t) ; manually defined
+
   ("GdkDrawable"
    :slots
    ((display