X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=gdk%2Fgdk.objects.lisp;h=0f076dd9aad0e715f423e4757b304329b100cfb5;hb=9624ae4b768c4abd0e75276255c75f78391a2589;hp=f3eb67aa82a0aa7338d3572afe74c6c18d8b3377;hpb=2d2dff4edad79e7ba21a1e6f96ca2ac10574f40c;p=cl-gtk2.git

diff --git a/gdk/gdk.objects.lisp b/gdk/gdk.objects.lisp
index f3eb67a..0f076dd 100644
--- a/gdk/gdk.objects.lisp
+++ b/gdk/gdk.objects.lisp
@@ -370,28 +370,6 @@
   (:translate 1)
   (:remove 2))
 
-(define-g-flags "GdkModifierType"
-    gdk-modifier-type
-    (:export t :type-initializer "gdk_modifier_type_get_type")
-  (:shift-mask 1)
-  (:lock-mask 2)
-  (:control-mask 4)
-  (:mod1-mask 8)
-  (:mod2-mask 16)
-  (:mod3-mask 32)
-  (:mod4-mask 64)
-  (:mod5-mask 128)
-  (:button1-mask 256)
-  (:button2-mask 512)
-  (:button3-mask 1024)
-  (:button4-mask 2048)
-  (:button5-mask 4096)
-  (:super-mask 67108864)
-  (:hyper-mask 134217728)
-  (:meta-mask 268435456)
-  (:release-mask 1073741824)
-  (:modifier-mask 1543512063))
-
 (define-g-flags "GdkWMDecoration"
     gdk-w-m-decoration
     (:export t :type-initializer "gdk_wm_decoration_get_type")
@@ -460,6 +438,18 @@
 (define-g-enum "GdkColorspace" colorspace ()
   :rgb)
 
+(define-g-enum "GdkAxisUse"
+    axis-use
+    (:export t :type-initializer "gdk_axis_use_get_type")
+  (:ignore 0)
+  (:x 1)
+  (:y 2)
+  (:pressure 3)
+  (:xtilt 4)
+  (:ytilt 5)
+  (:wheel 6)
+  (:last 7))
+
 (export 'cursor-type)
 
 (define-g-boxed-cstruct geometry nil
@@ -564,6 +554,9 @@
 
 
 ;;;FIXME: Check correct type
+#+ windows
+(defctype native-window :pointer)
+#- windows
 (defctype native-window :uint32)
 
 (define-foreign-type fixed-array ()
@@ -951,7 +944,20 @@
 
 (define-g-object-class "GdkPixmap" pixmap (:superclass drawable) ())
 
-(define-g-object-class "GdkKeymap" keymap () ())
+(define-g-object-class "GdkKeymap" keymap
+  (:superclass g-object :export t :interfaces
+               nil :type-initializer "gdk_keymap_get_type")
+  ((:cffi direction keymap-direction pango:pango-direction
+          "gdk_keymap_get_direction" nil)
+   (:cffi has-bidi-layouts keymap-has-bidi-layouts :boolean
+          "gdk_keymap_have_bidi_layouts" nil)
+   (:cffi caps-lock-state keymap-caps-lock-state :boolean
+          "gdk_keymap_get_caps_lock_state" nil)))
+
+(define-g-boxed-cstruct keymap-key nil
+  (keycode :uint :initform 0)
+  (group :int :initform 0)
+  (level :int :initform 0))
 
 (define-g-boxed-cstruct gdk-window-attr nil
   (title (:string :free-from-foreign nil) :initform nil)