~mdw
/
clg
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modified DEFAULT-ALIEN-FNAME
[clg]
/
gdk
/
gdktypes.lisp
diff --git
a/gdk/gdktypes.lisp
b/gdk/gdktypes.lisp
index
420c9ef
..
fd9354b
100644
(file)
--- a/
gdk/gdktypes.lisp
+++ b/
gdk/gdktypes.lisp
@@
-1,5
+1,5
@@
;; Common Lisp bindings for GTK+ v2.x
;; Common Lisp bindings for GTK+ v2.x
-;; Copyright 2000-200
5
Espen S. Johnsen <espen@users.sf.net>
+;; Copyright 2000-200
6
Espen S. Johnsen <espen@users.sf.net>
;;
;; Permission is hereby granted, free of charge, to any person obtaining
;; a copy of this software and associated documentation files (the
;;
;; Permission is hereby granted, free of charge, to any person obtaining
;; a copy of this software and associated documentation files (the
@@
-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.
;; 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.2
0 2005-04-24 13:29:36
espen Exp $
+;; $Id: gdktypes.lisp,v 1.2
4 2006-04-26 09:21:39
espen Exp $
(in-package "GDK")
(in-package "GDK")
@@
-36,20
+36,21
@@
(defclass color (boxed)
((pixel
:allocation :alien
(defclass color (boxed)
((pixel
:allocation :alien
- :type
unsigned-long
)
+ :type
(unsigned 32)
)
(red
:allocation :alien
:accessor color-red
(red
:allocation :alien
:accessor color-red
- :type
unsigned-short
)
+ :type
(unsigned 16)
)
(green
:allocation :alien
:accessor color-green
(green
:allocation :alien
:accessor color-green
- :type
unsigned-short
)
+ :type
(unsigned 16)
)
(blue
:allocation :alien
:accessor color-blue
(blue
:allocation :alien
:accessor color-blue
- :type unsigned-short))
- (:metaclass boxed-class))
+ :type (unsigned 16)))
+ (:metaclass boxed-class)
+ (:packed t))
(deftype point () '(vector int 2))
(deftype point () '(vector int 2))
@@
-82,7
+83,36
@@
:type int))
(:metaclass boxed-class))
:type int))
(:metaclass boxed-class))
+(register-type 'event-mask '|gdk_event_mask_get_type|)
+(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))
+(register-type 'event-mask '|gdk_modifier_type_get_type|)
+(define-flags-type modifier-type
+ :shift :lock :control :mod1 :mod2 :mod3 :mod4 :mod5
+ :button1 :button2 :button3 :button4 :button5
+ (:release #.(ash 1 30)))
(define-types-by-introspection "Gdk"
(define-types-by-introspection "Gdk"
@@
-98,7
+128,7
@@
("GdkGCX11" :ignore t)
("GdkColor" :ignore t)
("GdkEvent" :ignore t)
("GdkGCX11" :ignore t)
("GdkColor" :ignore t)
("GdkEvent" :ignore t)
- ("GdkRectngle" :ignore t)
+ ("GdkRect
a
ngle" :ignore t)
("GdkCursor" :ignore t)
("GdkFont" :ignore t) ; deprecated
("GdkEventMask" :ignore t) ; manually defined
("GdkCursor" :ignore t)
("GdkFont" :ignore t) ; deprecated
("GdkEventMask" :ignore t) ; manually defined
@@
-209,7
+239,9
@@
:getter "gdk_cursor_get_display"
:reader cursor-display
:type display))
:getter "gdk_cursor_get_display"
:reader cursor-display
:type display))
- (:metaclass boxed-class))
+ (:metaclass boxed-class)
+ (:ref %cursor-ref)
+ (:unref %cursor-unref))
(defclass geometry (struct)
(defclass geometry (struct)
@@
-270,7
+302,4
@@
:type gravity))
(:metaclass struct-class))
: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))