Make stub package for pango

diff --git a/gdk/cl-gtk2-gdk.asd b/gdk/cl-gtk2-gdk.asd
index 06af81f..7c5cb4b 100644 (file)
--- a/gdk/cl-gtk2-gdk.asd
+++ b/gdk/cl-gtk2-gdk.asd
@@ -7,4 +7,4 @@
                (:file "gdk.objects")
                (:file "gdk.functions")
                (:file "gdk.general"))
-  :depends-on (:cl-gtk2-glib :cffi))
\ No newline at end of file
+  :depends-on (:cl-gtk2-glib :cffi :cl-gtk2-pango))
\ No newline at end of file

diff --git a/gdk/gdk.functions.lisp b/gdk/gdk.functions.lisp
index 89843eb..f400533 100644 (file)
--- a/gdk/gdk.functions.lisp
+++ b/gdk/gdk.functions.lisp
@@ -19,6 +19,8 @@
 (defun (setf gdk-window-events) (new-value window)
   (gdk-window-set-events window new-value))
 
+(export 'gdk-window-events)
+
 (defcfun gdk-gc-new (g-object graphics-context :already-referenced)
   (drawable (g-object drawable)))
 
@@ -45,7 +47,7 @@
     (gdk-drawable-get-size drawable x y)
     (values (mem-ref x :int) (mem-ref y :int))))
 
-(define-g-object-class "PangoLayout" pango-layout (:type-initializer "pango_layout_get_type") ())
+(export 'drawable-get-size)
 
 (defcfun gdk-draw-layout :void
   (drawable (g-object drawable))

diff --git a/gdk/gdk.package.lisp b/gdk/gdk.package.lisp
index ee15780..e4330e0 100755 (executable)
--- a/gdk/gdk.package.lisp
+++ b/gdk/gdk.package.lisp
@@ -1,5 +1,5 @@
 (defpackage :gdk
-  (:use :cl :gobject :cffi)
+  (:use :cl :gobject :cffi :pango)
   (:export #:gdk-window-events
            #:gdk-gc-set-rgb-fg-color
            #:gdk-drawable-get-size

diff --git a/gtk/cl-gtk2-gtk.asd b/gtk/cl-gtk2-gtk.asd
index b5991fe..ee4ab70 100644 (file)
--- a/gtk/cl-gtk2-gtk.asd
+++ b/gtk/cl-gtk2-gtk.asd
@@ -66,4 +66,4 @@
                                      (:static-file "demo1.ui")
                                      (:static-file "text-editor.glade")
                                      (:static-file "text-editor.ui"))))
-  :depends-on (:cl-gtk2-glib :cffi :cl-gtk2-gdk :bordeaux-threads :iterate))
+  :depends-on (:cl-gtk2-glib :cffi :cl-gtk2-gdk :bordeaux-threads :iterate :cl-gtk2-pango))

diff --git a/gtk/gtk.objects.lisp b/gtk/gtk.objects.lisp
index c106f69..6ae54f6 100644 (file)
--- a/gtk/gtk.objects.lisp
+++ b/gtk/gtk.objects.lisp
@@ -137,16 +137,6 @@
 
 (export '(tree-row-reference-model tree-row-reference-path tree-row-reference-valid))
 
-(define-g-enum "PangoWrapMode" pango-wrap-mode
-    (:export t :type-initializer
-             "pango_wrap_mode_get_type")
-  (:word 0) (:char 1) (:word-char 2))
-
-(define-g-enum "PangoEllipsizeMode" pango-ellipsize-mode
-    (:export t :type-initializer
-             "pango_ellipsize_mode_get_type")
-  (:none 0) (:start 1) (:middle 2) (:end 3))
-
 (defcfun (adjustment-clamp-page "gtk_adjustment_clamp_page") :void
   (adjustment (g-object adjustment))
   (lower :double)

diff --git a/gtk/gtk.package.lisp b/gtk/gtk.package.lisp
index 5c62d58..61d36fb 100755 (executable)
--- a/gtk/gtk.package.lisp
+++ b/gtk/gtk.package.lisp
@@ -1,5 +1,5 @@
 (defpackage :gtk
-  (:use :cl :cffi :gobject :gdk :glib :iter)
+  (:use :cl :cffi :gobject :gdk :glib :iter :pango)
   (:export #:gtk-main
            #:gtk-main-quit
            #:dialog-run

diff --git a/gtk/gtk.widget.lisp b/gtk/gtk.widget.lisp
index a1f25c8..efffbf6 100644 (file)
--- a/gtk/gtk.widget.lisp
+++ b/gtk/gtk.widget.lisp
@@ -388,12 +388,7 @@
 
 (export 'widget-create-pango-context)
 
-(defcfun (widget-get-pango-context "gtk_widget_get_pango_context") g-object
-  (widget g-object))
-
-(export 'widget-get-pango-context)
-
-(defcfun (widget-create-pango-layout "gtk_widget_create_pango_layout") (g-object gdk::pango-layout :already-referenced)
+(defcfun (widget-create-pango-layout "gtk_widget_create_pango_layout") (g-object pango-layout :already-referenced)
   (widget (g-object widget))
   (text :string))
 

diff --git a/pango/cl-gtk2-pango.asd b/pango/cl-gtk2-pango.asd
new file mode 100644 (file)
index 0000000..40be8dc
--- /dev/null
+++ b/pango/cl-gtk2-pango.asd
@@ -0,0 +1,9 @@
+(defsystem :cl-gtk2-pango
+  :name :cl-gtk2-pango
+  :author "Kalyanov Dmitry <Kalyanov.Dmitry@gmail.com>"
+  :license "LLGPL"
+  :serial t
+  :components ((:file "pango.package")
+               (:file "pango.init")
+               (:file "pango"))
+  :depends-on (:cl-gtk2-glib :iterate))
\ No newline at end of file

diff --git a/pango/pango.init.lisp b/pango/pango.init.lisp
new file mode 100644 (file)
index 0000000..1a88b63
--- /dev/null
+++ b/pango/pango.init.lisp
@@ -0,0 +1,10 @@
+(in-package :pango)
+
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (define-foreign-library pango
+    (:unix "libpango-1.0.so.0")
+    (:windows "libpango-1.0-0.dll")
+    (t (:default "libgpango-1.0"))))
+
+(use-foreign-library pango)
+

diff --git a/pango/pango.lisp b/pango/pango.lisp
new file mode 100644 (file)
index 0000000..a8537b3
--- /dev/null
+++ b/pango/pango.lisp
@@ -0,0 +1,19 @@
+(in-package :pango)
+
+(define-g-enum "PangoWrapMode" pango-wrap-mode
+    (:export t :type-initializer
+             "pango_wrap_mode_get_type")
+  (:word 0) (:char 1) (:word-char 2))
+
+(export 'pango-wrap-mode)
+
+(define-g-enum "PangoEllipsizeMode" pango-ellipsize-mode
+    (:export t :type-initializer
+             "pango_ellipsize_mode_get_type")
+  (:none 0) (:start 1) (:middle 2) (:end 3))
+
+(export 'pango-ellipsize-mode)
+
+(define-g-object-class "PangoLayout" pango-layout (:type-initializer "pango_layout_get_type") ())
+
+(export 'pango-layout)

diff --git a/pango/pango.package.lisp b/pango/pango.package.lisp
new file mode 100644 (file)
index 0000000..0881024
--- /dev/null
+++ b/pango/pango.package.lisp
@@ -0,0 +1,2 @@
+(defpackage :pango
+  (:use :cl :iter :cffi :gobject :glib))