~mdw
/
clg
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
557e2be
)
Added (or null ...) return types
author
espen
<espen>
Fri, 11 Apr 2008 19:47:39 +0000
(19:47 +0000)
committer
espen
<espen>
Fri, 11 Apr 2008 19:47:39 +0000
(19:47 +0000)
gdk/gdk.lisp
patch
|
blob
|
blame
|
history
gdk/pixbuf.lisp
patch
|
blob
|
blame
|
history
diff --git
a/gdk/gdk.lisp
b/gdk/gdk.lisp
index
d44cbfd
..
3288559
100644
(file)
--- a/
gdk/gdk.lisp
+++ b/
gdk/gdk.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.
;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-;; $Id: gdk.lisp,v 1.4
8 2008-01-02 15:26:46
espen Exp $
+;; $Id: gdk.lisp,v 1.4
9 2008-04-11 19:47:39
espen Exp $
(in-package "GDK")
(in-package "GDK")
@@
-44,7
+44,7
@@
(display-name display) (pointer-address (foreign-location display))))
(call-next-method)))
(display-name display) (pointer-address (foreign-location display))))
(call-next-method)))
-(defbinding %display-open ()
display
+(defbinding %display-open ()
(or null display)
(display-name (or null string)))
(defvar *display-aliases* ())
(display-name (or null string)))
(defvar *display-aliases* ())
@@
-102,11
+102,11
@@
(defbinding flush () nil)
(defbinding display-get-event
(defbinding flush () nil)
(defbinding display-get-event
- (&optional (display (display-get-default)))
event
+ (&optional (display (display-get-default)))
(or null event)
(display display))
(defbinding display-peek-event
(display display))
(defbinding display-peek-event
- (&optional (display (display-get-default)))
event
+ (&optional (display (display-get-default)))
(or null event)
(display display))
(defbinding display-put-event
(display display))
(defbinding display-put-event
@@
-149,7
+149,7
@@
;;; Display manager
;;; Display manager
-(defbinding display-get-default ()
display
)
+(defbinding display-get-default ()
(or null display)
)
(defbinding (display-set-default "gdk_display_manager_set_default_display")
(display) nil
(defbinding (display-set-default "gdk_display_manager_set_default_display")
(display) nil
@@
-303,14
+303,14
@@
(defbinding (events-pending-p "gdk_events_pending") () boolean)
(defbinding (events-pending-p "gdk_events_pending") () boolean)
-(defbinding event-get ()
event
)
+(defbinding event-get ()
(or null event)
)
-(defbinding event-peek ()
event
)
+(defbinding event-peek ()
(pr null event)
)
(defbinding event-get-graphics-expose () event
(window window))
(defbinding event-get-graphics-expose () event
(window window))
-(defbinding event-put ()
event
+(defbinding event-put ()
nil
(event event))
;(defbinding event-handler-set () ...)
(event event))
;(defbinding event-handler-set () ...)
@@
-415,7
+415,9
@@
(defbinding window-destroy () nil
(window window))
(defbinding window-destroy () nil
(window window))
-(defbinding window-at-pointer () window
+(defbinding (window-at-pointer "gdk_display_get_window_at_pointer")
+ (&optional (display (display-get-default))) (or null window)
+ display
(x int :out)
(y int :out))
(x int :out)
(y int :out))
@@
-735,7
+737,7
@@
(x int :out)
(y int :out))
(x int :out)
(y int :out))
-(defbinding window-get-pointer ()
window
+(defbinding window-get-pointer ()
(or null window)
(window window)
(x int :out)
(y int :out)
(window window)
(x int :out)
(y int :out)
diff --git
a/gdk/pixbuf.lisp
b/gdk/pixbuf.lisp
index
08f96d8
..
47ec7aa
100644
(file)
--- a/
gdk/pixbuf.lisp
+++ b/
gdk/pixbuf.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.
;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-;; $Id: pixbuf.lisp,v 1.
6 2007-06-18 10:14
:39 espen Exp $
+;; $Id: pixbuf.lisp,v 1.
7 2008-04-11 19:47
:39 espen Exp $
(in-package "GDK")
(in-package "GDK")
@@
-31,13
+31,13
@@
(defbinding %pixbuf-new-from-file () (referenced pixbuf)
(filename pathname)
(defbinding %pixbuf-new-from-file () (referenced pixbuf)
(filename pathname)
- (nil
gerror
:out))
+ (nil
(or null gerror)
:out))
(defbinding %pixbuf-new-from-file-at-size () (referenced pixbuf)
(filename pathname)
(width int)
(height int)
(defbinding %pixbuf-new-from-file-at-size () (referenced pixbuf)
(filename pathname)
(width int)
(height int)
- (nil
gerror
:out))
+ (nil
(or null gerror)
:out))
#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
(defbinding %pixbuf-new-from-file-at-scale () (referenced pixbuf)
#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
(defbinding %pixbuf-new-from-file-at-scale () (referenced pixbuf)
@@
-45,7
+45,7
@@
(width int)
(height int)
(preserve-aspect-ratio boolean)
(width int)
(height int)
(preserve-aspect-ratio boolean)
- (nil
gerror
:out))
+ (nil
(or null gerror)
:out))
(defun pixbuf-load (filename &key width height size (preserve-aspect-ratio t))
#?-(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
(defun pixbuf-load (filename &key width height size (preserve-aspect-ratio t))
#?-(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
@@
-83,7
+83,7
@@
(type string)
(keys strings)
(values strings)
(type string)
(keys strings)
(values strings)
- (nil
gerror
:out))
+ (nil
(or null gerror)
:out))
(defun pixbuf-save (pixbuf filename type &rest options)
(let ((keys (make-array 0 :adjustable t :fill-pointer t))
(defun pixbuf-save (pixbuf filename type &rest options)
(let ((keys (make-array 0 :adjustable t :fill-pointer t))
@@
-118,7
+118,7
@@
(%pixbuf-copy pixbuf)
(%pixbuf-new-subpixbuf pixbuf x y width height)))
(%pixbuf-copy pixbuf)
(%pixbuf-new-subpixbuf pixbuf x y width height)))
-(defbinding %pixbuf-get-from-drawable () (
referenced pixbuf
)
+(defbinding %pixbuf-get-from-drawable () (
or null (referenced pixbuf)
)
(dest (or null pixbuf))
(drawable drawable)
(colormap (or null colormap))
(dest (or null pixbuf))
(drawable drawable)
(colormap (or null colormap))