X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=gdk%2Fgdk.package.lisp;h=0e4f12b7377c6398869c2c27a8a014d8ea1e813e;hb=00346cf6cc21a7a1daa85c3c4bfcac0d86d023b2;hp=ee15780910fa5e58a9d488671759958a6cb0b8ba;hpb=1627a51bca650be055905e0c94364f30a549ffc7;p=cl-gtk2.git

diff --git a/gdk/gdk.package.lisp b/gdk/gdk.package.lisp
old mode 100755
new mode 100644
index ee15780..0e4f12b
--- a/gdk/gdk.package.lisp
+++ b/gdk/gdk.package.lisp
@@ -1,26 +1,48 @@
 (defpackage :gdk
-  (:use :cl :gobject :cffi)
+  (:use :cl :gobject :cffi :pango :iter)
   (:export #:gdk-window-events
-           #:gdk-gc-set-rgb-fg-color
-           #:gdk-drawable-get-size
-           #:gdk-draw-line
-           #:gdk-gc-new
-           #:drawable-get-size
-           #:gdk-draw-layout
-           #:gdk-atom-as-string
-           #:gdk-window-events))
+           #:gdk-atom-as-string))
 
 (in-package :gdk)
 
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (define-foreign-library gdk
-    (:unix (:or "libgdk-x11-2.0.so.0" "libgdk-x11-2.0.so"))
-    (:windows "libgdk-win32-2.0-0.dll")
-    (t "libgdk-2.0"))
-  (define-foreign-library gdk-pixbuf
-    (:unix (:or "libgdk_pixbuf-2.0.so.0" "libgdk_pixbuf-2.0.so"))
-    (:windows (:or "libgdk_pixbuf-win32-2.0-0" "libgdk_pixbuf-2.0-0.dll"))
-    (t "libgdk_pixbuf-2.0")))
+(glib:at-init ()
+  (eval-when (:compile-toplevel :load-toplevel :execute)
+    (define-foreign-library gdk
+      ((:and :unix (:not :darwin)) (:or "libgdk-x11-2.0.so.0" "libgdk-x11-2.0.so"))
+      (:darwin (:or "libgdk-x11-2.0.0.dylib" "libgdk-x11-2.0.dylib"))
+      (:windows "libgdk-win32-2.0-0.dll")
+      (t "libgdk-2.0"))
+    (define-foreign-library gdk-pixbuf
+      ((:and :unix (:not :darwin)) (:or "libgdk_pixbuf-2.0.so.0" "libgdk_pixbuf-2.0.so"))
+      (:darwin (:or "libgdk_pixbuf-2.0.0.dylib" "libgdk_pixbuf-2.0.dylib"))
+      (:windows (:or "libgdk_pixbuf-win32-2.0-0" "libgdk_pixbuf-2.0-0.dll"))
+      (t "libgdk_pixbuf-2.0"))
 
-(use-foreign-library gdk)
-(use-foreign-library gdk-pixbuf)
\ No newline at end of file
+    (define-foreign-library gtk
+      ((:and :unix (:not :darwin)) (:or "libgtk-x11-2.0.so.0" "libgtk-x11-2.0.so"))
+      (:darwin (:or "libgtk-x11-2.0.0.dylib" "libgtk-x11-2.0.dylib"))
+      (:windows (:or "libgtk-2.0-0.dll" "libgtk-win32-2.0-0.dll"))
+      (t "libgtk-2.0")))
+
+  (use-foreign-library gdk)
+  (use-foreign-library gdk-pixbuf)
+  (use-foreign-library gtk))
+
+(defcvar (*gtk-major-version* "gtk_major_version" :read-only t :library gtk) :uint)
+(defcvar (*gtk-minor-version* "gtk_minor_version" :read-only t :library gtk) :uint)
+(defcvar (*gtk-micro-version* "gtk_micro_version" :read-only t :library gtk) :uint)
+(defcvar (*gtk-binary-age* "gtk_binary_age" :read-only t :library gtk) :uint)
+(defcvar (*gtk-interface-age* "gtk_interface_age" :read-only t :library gtk) :uint)
+
+(glib:push-library-version-features gtk *gtk-major-version* *gtk-minor-version*
+  2 2
+  2 4
+  2 6
+  2 8
+  2 10
+  2 12
+  2 14
+  2 16
+  2 18)
+
+(glib:require-library-version "Gtk+" 2 16 *gtk-major-version* *gtk-minor-version*)