Fix compilation for Gtk with the new, stricter inheritance

[clg] / gdk / gdktypes.lisp

diff --git a/gdk/gdktypes.lisp b/gdk/gdktypes.lisp
index 97cba9d9adfecf8e937fac47fe9ab1e460c0ba3a..7a0783ed24824e314ff370ecd80d2630ec0b0f2d 100644 (file)
--- a/gdk/gdktypes.lisp
+++ b/gdk/gdktypes.lisp
@@ -20,17 +20,13 @@
 ;; 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.27 2006-09-05 13:14:10 espen Exp $
+;; $Id: gdktypes.lisp,v 1.29 2008-10-27 18:42:01 espen Exp $
 
 (in-package "GDK")
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (init-types-in-library #.(concatenate 'string
-                           (pkg-config:pkg-variable "gtk+-2.0" "libdir")
-                           "/libgdk-x11-2.0." asdf:*dso-extension*) :prefix ("gdk_" "_gdk_"))
-  (init-types-in-library #.(concatenate 'string
-                           (pkg-config:pkg-variable "gtk+-2.0" "libdir")
-                           "/libgdk_pixbuf-2.0." asdf:*dso-extension*) :prefix "gdk_"))
+  (init-types-in-library gdk "libgdk-2.0" :prefix ("gdk_" "_gdk_"))
+  (init-types-in-library gdk "libgdk_pixbuf-2.0" :prefix "gdk_"))
 
 
 (defclass color (boxed)
@@ -141,6 +137,9 @@ (define-types-by-introspection "Gdk"
   ("GdkEventMask" :ignore t) ; manually defined
   ("GdkModifierType" :ignore t) ; manually defined
 
+  ("GdkAppLaunchContext" :ignore t) ; needs GIO
+
+
   ("GdkDisplay"
    :slots
    ((name
@@ -157,6 +156,7 @@ (define-types-by-introspection "Gdk"
      :reader display-devices
      :type (copy-of (glist device)))))
 
+  ;; TODO: add unbound options
   ("GdkDrawable"
    :slots
    ((display