X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/34abe734976bd58ceee345f5f6d1ad1a914acfc3..5dd328ff6f454bf520aa9dbc5f4461eaaf4a4c1b:/gdk/gdktypes.lisp

diff --git a/gdk/gdktypes.lisp b/gdk/gdktypes.lisp
index 9304173..2adbb93 100644
--- 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.26 2006-08-30 11:08:12 espen Exp $
+;; $Id: gdktypes.lisp,v 1.28 2007-06-06 10:43:54 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)
@@ -115,7 +111,7 @@ (define-flags-type event-mask
   :scroll
   (:all-events #x3FFFFE))
 
-(register-type 'event-mask '|gdk_modifier_type_get_type|)
+(register-type 'modifier-type '|gdk_modifier_type_get_type|)
 (define-flags-type modifier-type
   :shift :lock :control :mod1 :mod2 :mod3 :mod4 :mod5 
   :button1 :button2 :button3 :button4 :button5
@@ -157,6 +153,7 @@ (define-types-by-introspection "Gdk"
      :reader display-devices
      :type (copy-of (glist device)))))
 
+  ;; TODO: add unbound options
   ("GdkDrawable"
    :slots
    ((display