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

[clg] / gdk / pixbuf.lisp

diff --git a/gdk/pixbuf.lisp b/gdk/pixbuf.lisp
index c622ccaceca3e04f21b5b43602e66165d6056b93..7cbdce25e4a634067095daad92dbc3c42336a243 100644 (file)
--- a/gdk/pixbuf.lisp
+++ b/gdk/pixbuf.lisp
@@ -1,21 +1,26 @@
-;; Common Lisp bindings for GTK+ v2.0
-;; Copyright (C) 2004 Espen S. Johnsen <espen@users.sf.net>
+;; Common Lisp bindings for GTK+ v2.x
+;; Copyright 2004-2005 Espen S. Johnsen <espen@users.sf.net>
 ;;
-;; This library is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 2 of the License, or (at your option) any later version.
+;; Permission is hereby granted, free of charge, to any person obtaining
+;; a copy of this software and associated documentation files (the
+;; "Software"), to deal in the Software without restriction, including
+;; without limitation the rights to use, copy, modify, merge, publish,
+;; distribute, sublicense, and/or sell copies of the Software, and to
+;; permit persons to whom the Software is furnished to do so, subject to
+;; the following conditions:
 ;;
-;; This library is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; Lesser General Public License for more details.
+;; The above copyright notice and this permission notice shall be
+;; included in all copies or substantial portions of the Software.
 ;;
-;; You should have received a copy of the GNU Lesser General Public
-;; License along with this library; if not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+;; IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+;; CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+;; 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.2 2005-02-14 00:46:31 espen Exp $
+;; $Id: pixbuf.lisp,v 1.4 2006-04-25 22:27:13 espen Exp $
 
 
 (in-package "GDK")
@@ -34,7 +39,7 @@ (defbinding %pixbuf-new-from-file-at-size () (referenced pixbuf)
   (height int)
   (nil gerror :out))
 
-#+gtk2.6
+#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
 (defbinding %pixbuf-new-from-file-at-scale () (referenced pixbuf)
   (filename pathname)
   (width int)
@@ -43,18 +48,22 @@ (defbinding %pixbuf-new-from-file-at-scale () (referenced pixbuf)
   (nil gerror :out))
 
 (defun pixbuf-load (filename &key width height size (preserve-aspect-ratio t))
-  #-gtk2.6
+  #?-(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
   (unless preserve-aspect-ratio 
     (warn ":preserve-aspect-ratio not supported with this version of Gtk"))
 
   (multiple-value-bind (pixbuf gerror)
       (cond
        (size 
-       #-gtk2.6(%pixbuf-new-from-file-at-size filename size size)
-       #+gtk2.6(%pixbuf-new-from-file-at-scale filename size size preserve-aspect-ratio))
+       #?-(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
+       (%pixbuf-new-from-file-at-size filename size size)
+       #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
+       (%pixbuf-new-from-file-at-scale filename size size preserve-aspect-ratio))
        ((and width height)
-       #-gtk2.6(%pixbuf-new-from-file-at-size filename width height)
-       #+gtk2.6(%pixbuf-new-from-file-at-scale filename width height preserve-aspect-ratio))
+       #?-(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
+       (%pixbuf-new-from-file-at-size filename width height)
+       #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
+       (%pixbuf-new-from-file-at-scale filename width height preserve-aspect-ratio))
        ((or width height)
        (error "Both :width and :height must be specified"))
        (t (%pixbuf-new-from-file filename)))