Temporary hack to get clg build with Gtk+ 2.14

[clg] / gdk / gdktypes.lisp

diff --git a/gdk/gdktypes.lisp b/gdk/gdktypes.lisp
index 80983ed62757634c8317b5793c7382cea1d32f44..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.
 
 ;; 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.25 2006-07-06 13:05:59 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)
 
 (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)
 
 
 (defclass color (boxed)


@@ -115,7 +111,7 @@ (define-flags-type event-mask
   :scroll
   (:all-events #x3FFFFE))
 
   :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
 (define-flags-type modifier-type
   :shift :lock :control :mod1 :mod2 :mod3 :mod4 :mod5 
   :button1 :button2 :button3 :button4 :button5


@@ -141,6 +137,9 @@ (define-types-by-introspection "Gdk"
   ("GdkEventMask" :ignore t) ; manually defined
   ("GdkModifierType" :ignore t) ; manually defined
 
   ("GdkEventMask" :ignore t) ; manually defined
   ("GdkModifierType" :ignore t) ; manually defined
 

+  ("GdkAppLaunchContext" :ignore t) ; needs GIO
+
+

   ("GdkDisplay"
    :slots
    ((name
   ("GdkDisplay"
    :slots
    ((name


@@ -157,6 +156,7 @@ (define-types-by-introspection "Gdk"
      :reader display-devices
      :type (copy-of (glist device)))))
 
      :reader display-devices
      :type (copy-of (glist device)))))
 

+  ;; TODO: add unbound options

   ("GdkDrawable"
    :slots
    ((display
   ("GdkDrawable"
    :slots
    ((display