[gtk-cffi-cvs] CVS gtk-cffi/g-object

[CVS User rklochkov]

Update of /project/gtk-cffi/cvsroot/gtk-cffi/g-object
In directory tiger.common-lisp.net:/tmp/cvs-serv24265/g-object

Modified Files:
	defslots.lisp g-object-cffi.asd g-object-class.lisp 
	g-value.lisp loadlib.lisp package.lisp 
Log Message:
Changed from cffi to cffi-objects
Dropped GTK-STRING



--- /project/gtk-cffi/cvsroot/gtk-cffi/g-object/defslots.lisp	2012/01/25 19:15:08	1.8
+++ /project/gtk-cffi/cvsroot/gtk-cffi/g-object/defslots.lisp	2012/02/12 17:29:41	1.9
@@ -16,8 +16,8 @@
 (defun get-prefix ()
   (cdr (assoc *package* *gtk-prefixes*)))
 
-(defun pair (maybe-pair)
-  (if (consp maybe-pair) maybe-pair (cons maybe-pair maybe-pair)))
+;(defun pair (maybe-pair)
+;  (if (consp maybe-pair) maybe-pair (cons maybe-pair maybe-pair)))
 
 (defun expand-defslot (prefix current-class slot-name slot-type)
   (destructuring-bind (name-lisp . name-gtk) (pair slot-name)
@@ -54,7 +54,7 @@
            (defgdkslots 'gdk)
            (defslots (get-prefix)))
    (destructuring-bind (name prefix) param
-     `(defmacro ,name (current-class &rest slots)
+     `(defmacro ,name (current-class &body slots)
         (expand-defslots ,prefix current-class slots))))
  
 (defun expand-deffun (prefix name res-type class params &key get)
@@ -127,7 +127,7 @@
            (defgdkfuns 'gdk)
            (deffuns (get-prefix)))
   (destructuring-bind (name prefix) param        
-    `(defmacro ,name (class &rest funs)
+    `(defmacro ,name (class &body funs)
        (expand-deffuns ,prefix class funs))))
 
 (defmacro with-object ((name &optional for-free) init &rest body)
--- /project/gtk-cffi/cvsroot/gtk-cffi/g-object/g-object-cffi.asd	2011/08/26 17:16:13	1.3
+++ /project/gtk-cffi/cvsroot/gtk-cffi/g-object/g-object-cffi.asd	2012/02/12 17:29:41	1.4
@@ -13,7 +13,7 @@
   :description "GObject,GType and GValue staff for gtk-cffi"
   :author "Roman Klochkov <kalimehtar at mail.ru>"
   :version "0.3"
-  :license "LGPL"
+  :license "BSD"
   :depends-on (cffi-object g-lib-cffi gtk-cffi-utils)
   :components
   ((:file package)
--- /project/gtk-cffi/cvsroot/gtk-cffi/g-object/g-object-class.lisp	2011/09/10 16:26:10	1.4
+++ /project/gtk-cffi/cvsroot/gtk-cffi/g-object/g-object-class.lisp	2012/02/12 17:29:41	1.5
@@ -48,12 +48,12 @@
 (defmethod name ((g-param-spec g-param-spec))
   (g-param-spec-get-name g-param-spec))
 
-(defcfun "g_param_spec_get_nick" gtk-string (param pobject))
+(defcfun "g_param_spec_get_nick" :string (param pobject))
 
 (defmethod nick ((g-param-spec g-param-spec))
   (g-param-spec-get-nick g-param-spec))
 
-(defcfun "g_param_spec_get_blurb" gtk-string (param pobject))
+(defcfun "g_param_spec_get_blurb" :string (param pobject))
 
 (defmethod blurb ((g-param-spec g-param-spec))
   (g-param-spec-get-blurb g-param-spec))
--- /project/gtk-cffi/cvsroot/gtk-cffi/g-object/g-value.lisp	2011/08/26 17:16:13	1.2
+++ /project/gtk-cffi/cvsroot/gtk-cffi/g-object/g-value.lisp	2012/02/12 17:29:41	1.3
@@ -40,7 +40,7 @@
 (defcfun "g_value_set_double" :void (g-value pobject) (val :double))
 (defcfun "g_value_set_enum" :void (g-value pobject) (val :int))
 (defcfun "g_value_set_flags" :void (g-value pobject) (val :uint))
-(defcfun "g_value_set_string" :void (g-value pobject) (val gtk-string))
+(defcfun "g_value_set_string" :void (g-value pobject) (val :string))
 (defcfun "g_value_set_param" :void (g-value pobject) (val :pointer))
 (defcfun "g_value_set_boxed" :void (g-value pobject) (val :pointer))
 (defcfun "g_value_set_pointer" :void (g-value pobject) (val :pointer))
@@ -115,7 +115,7 @@
 (defcfun "g_value_get_double" :double (g-value :pointer))
 (defcfun "g_value_get_enum" :int (g-value :pointer))
 (defcfun "g_value_get_flags" :uint (g-value :pointer))
-(defcfun "g_value_get_string" gtk-string (g-value :pointer))
+(defcfun "g_value_get_string" :string (g-value :pointer))
 (defcfun "g_value_get_param" :pointer (g-value :pointer))
 (defcfun "g_value_get_boxed" :pointer (g-value :pointer))
 (defcfun "g_value_get_pointer" pobject (g-value :pointer))
--- /project/gtk-cffi/cvsroot/gtk-cffi/g-object/loadlib.lisp	2012/01/25 19:15:08	1.2
+++ /project/gtk-cffi/cvsroot/gtk-cffi/g-object/loadlib.lisp	2012/02/12 17:29:41	1.3
@@ -8,9 +8,8 @@
 
 (in-package #:g-object-cffi)
 
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (define-foreign-library :g-object
-    (:unix "libgobject-2.0.so")
-    (:windows "libgobject-2.0-0.dll"))
+(define-foreign-library :g-object
+  (:unix "libgobject-2.0.so")
+  (:windows "libgobject-2.0-0.dll"))
 
-  (load-foreign-library :g-object))
\ No newline at end of file
+(use-foreign-library :g-object)
\ No newline at end of file
--- /project/gtk-cffi/cvsroot/gtk-cffi/g-object/package.lisp	2012/01/25 19:15:08	1.8
+++ /project/gtk-cffi/cvsroot/gtk-cffi/g-object/package.lisp	2012/02/12 17:29:41	1.9
@@ -8,9 +8,8 @@
 (in-package #:cl-user)
 
 (defpackage #:g-object-cffi
-  (:use #:common-lisp #:cffi #:alexandria #:iterate
-        #:cffi-object #:g-lib-cffi #:gtk-cffi-utils)
-  (:import-from #:cffi-object *objects*)
+  (:use #:common-lisp #:alexandria #:iterate
+        #:cffi-objects #:g-lib-cffi #:gtk-cffi-utils)
   (:export
 
    #:g-object