Correctly sort out string-specified getters in virtual-slots.lisp

[clg] / gdk / gdktypes.lisp

diff --git a/gdk/gdktypes.lisp b/gdk/gdktypes.lisp
index fd9354b..7a0783e 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.24 2006-04-26 09:21:39 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.so") :prefix ("gdk_" "_gdk_"))
-  (init-types-in-library #.(concatenate 'string
-                           (pkg-config:pkg-variable "gtk+-2.0" "libdir")
-                           "/libgdk_pixbuf-2.0.so") :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)
@@ -83,6 +79,13 @@
     :type int))
   (:metaclass boxed-class))
 
+(defclass region (struct)
+  ()
+  (:metaclass struct-class)
+  (:ref %region-copy)
+  (:unref %region-destroy))
+
+
 (register-type 'event-mask '|gdk_event_mask_get_type|)
 (define-flags-type event-mask
   (:exposure 2)
@@ -108,7 +111,7 @@
   :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
@@ -134,6 +137,9 @@
   ("GdkEventMask" :ignore t) ; manually defined
   ("GdkModifierType" :ignore t) ; manually defined
 
+  ("GdkAppLaunchContext" :ignore t) ; needs GIO
+
+
   ("GdkDisplay"
    :slots
    ((name
@@ -150,6 +156,7 @@
      :reader display-devices
      :type (copy-of (glist device)))))
 
+  ;; TODO: add unbound options
   ("GdkDrawable"
    :slots
    ((display
@@ -221,7 +228,27 @@
      :setter "gdk_window_set_group"
      :unbound nil
      :accessor window-group
-     :type window))))
+     :type window)
+    #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.10.0")
+    (type-hint
+     :allocation :virtual
+     :getter "gdk_window_get_type_hint"
+     :setter "gdk_window_set_type_hint"
+     :accessor window-type-hint
+     :type window-type-hint)
+    #?-(pkg-exists-p "gtk+-2.0" :atleast-version "2.10.0")
+    (type-hint
+     :allocation :virtual
+     :getter "gdk_window_get_type_hint"
+     :accessor window-type-hint
+     :type window-type-hint)
+    (decorations
+     :allocation :virtual
+     :getter %window-decoration-getter
+     :setter "gdk_window_set_decoration"
+     :boundp %window-decoration-boundp
+     :accessor window-decorations
+     :type wm-decoration))))
 
 
 (deftype bitmap () 'pixmap)