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

[CVS User rklochkov]

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

Modified Files:
	builder.lisp package.lisp scale.lisp text-buffer.lisp 
Log Message:
Synced package.lisp wight GtkScale


--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/builder.lisp	2012/05/07 09:02:04	1.3
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/builder.lisp	2012/08/19 16:19:26	1.4
@@ -14,18 +14,19 @@
   (gtk-builder-new))
 
 (defcfun gtk-builder-add-from-file :uint 
-  (builder pobject) (filename :string) (g-error g-error))
+  (builder pobject) (filename :string) (g-error (:pointer (:struct g-error))))
 
 (defcfun gtk-builder-add-from-string :uint 
-  (builder pobject) (string :string) (length gsize) (g-error g-error))
+  (builder pobject) (string :string) (length gsize) 
+  (g-error (:pointer (:struct g-error))))
 
 (defcfun gtk-builder-add-objects-from-file :uint 
   (builder pobject) (filename :string) (object-ids string-list) 
-  (g-error g-error))
+  (g-error (:pointer (:struct g-error))))
 
 (defcfun gtk-builder-add-objects-from-string :uint 
   (builder pobject) (string :string) (length gsize) (object-ids string-list) 
-  (g-error g-error))
+  (g-error (:pointer (:struct g-error))))
 
 (defgeneric add-from (builder &key filename string objects)
   (:method 
@@ -75,11 +76,11 @@
 
 (defcfun gtk-builder-value-from-string :boolean 
   (builder pobject) (pspec pobject) (string :string) (value pobject) 
-  (g-error g-error))
+  (g-error (:pointer (:struct g-error))))
 
 (defcfun gtk-builder-value-from-string-type :boolean 
   (builder pobject) (g-type g-type) (string :string) (value pobject) 
-  (g-error g-error))
+  (g-error (:pointer (:struct g-error))))
 
 (defgeneric value-from-string (builder &key g-type param-spec string)
   (:method ((builder builder) &key g-type param-spec string)
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/package.lisp	2012/08/19 15:45:26	1.26
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/package.lisp	2012/08/19 16:19:26	1.27
@@ -1046,6 +1046,15 @@
    #:alpha
    #:use-alpha
    #:title
+
+   #:scale
+   ;; slots
+   #:digits
+   #:value-pos
+   #:draw-value
+   #:has-origin
+   ;; methods
+   #:clear-marks
    ))
 
 (in-package #:gtk-cffi)
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/scale.lisp	2012/08/19 15:44:44	1.1
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/scale.lisp	2012/08/19 16:19:26	1.2
@@ -8,13 +8,16 @@
 (defclass scale (range)
   ())
 
-(defcfun gtk-scale-new :pointer)
-(defcfun gtk-scale-new-with-range :pointer)
+(defcfun gtk-scale-new :pointer (orientation orientation) (adjustment pobject))
+(defcfun gtk-scale-new-with-range :pointer (orientation orientation)
+         (min :double) (max :double) (step :double))
 
-(defmethod gconstructor ((scale scale) &key range &allow-other-keys)
-  (if range
-      (gtk-scale-new-with-range range)
-      (gtk-scale-new)))
+(defmethod gconstructor ((scale scale) &key orientation adjustment 
+                         (min 0.0d0) (max 0.0d0) (step 0.0d0) &allow-other-keys)
+  (if adjustment
+      (gtk-scale-new orientation adjustment)
+      (gtk-scale-new-with-range orientation min max step)))
+      
 
 (defslots scale
   digits :int
@@ -24,7 +27,8 @@
 
 (deffuns scale
   (:get layout pobject)
-  (add-mark :void (value :double) (position position-type) (markup :string))
+  (add-mark :void &key (value :double) 
+            (position position-type) (markup :string))
   (clear-marks :void))
 
 (defcfun gtk-scale-get-layout-offsets :void (entry pobject) 
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/text-buffer.lisp	2012/08/12 17:42:30	1.9
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/text-buffer.lisp	2012/08/19 16:19:26	1.10
@@ -186,7 +186,7 @@
   (create-child-anchor pobject (text-iter pobject))
   (create-mark pobject (mark-name :string) (where (struct text-iter)) 
                (left-gravity :boolean))
-  (add-mark :void (mark pobject) (where (struct text-iter)))
+  (add-mark :void &key (mark pobject) (where (struct text-iter)))
   (:get mark pobject (name :string))
   (get-insert pobject)
   (:get selection-bound pobject)