[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-serv18539/gtk

Modified Files:
	enums.lisp frame.lisp gtk-cffi.asd package.lisp 
	scrolled-window.lisp statusbar.lisp 
Log Message:
GtkScrolledWindow is 100% binded



--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/enums.lisp	2011/08/28 10:30:13	1.2
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/enums.lisp	2011/09/15 10:28:21	1.3
@@ -15,4 +15,13 @@
   :tab-forward :tab-backward :up :down :left :right)
 
 (defcenum orientation
-  :horizontal :vertical)
\ No newline at end of file
+  :horizontal :vertical)
+
+(defcenum policy
+  :always :automatic :never)
+
+(defcenum shadow-type
+  :none :in :out :etched-in :etched-out)
+
+(defcenum corner-type
+  :top-left :bottom-left :top-right :bottom-right)
\ No newline at end of file
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/frame.lisp	2011/04/25 19:16:08	1.1.1.1
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/frame.lisp	2011/09/15 10:28:21	1.2
@@ -9,9 +9,6 @@
                          &key label &allow-other-keys)
   (gtk-frame-new label))
 
-(defcenum shadow-type
-  :none :in :out :etched-in :etched-out)
-
 (defcfun "gtk_frame_set_shadow_type" :void
   (frame pobject) (shadow shadow-type))
 
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/gtk-cffi.asd	2011/09/10 16:26:11	1.5
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/gtk-cffi.asd	2011/09/15 10:28:21	1.6
@@ -21,7 +21,6 @@
    (:file loadlib :depends-on (package))
    (:file generics :depends-on (package))
    (:file common :depends-on (loadlib generics))
-   (:file pango :depends-on (loadlib))
    (:file accel-group :depends-on (loadlib))
    (:file style-context :depends-on (loadlib enums icon css-provider))
    (:file style-provider :depends-on (loadlib))
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/package.lisp	2011/09/11 15:48:21	1.6
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/package.lisp	2011/09/15 10:28:21	1.7
@@ -322,7 +322,16 @@
    
    #:scrolled-window
    ;; scrolled-window slots
+   #:hadjustment
+   #:vadjustment
+   #:shadow-type
+   #:placement
+   #:min-content-width
+   #:min-content-height
    #:policy
+   ;; scrolled-window methods
+   #:unset-placement
+   #:add-with-viewport
 
    #:tree-selection
    ;; tree-selection methods
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/scrolled-window.lisp	2011/04/25 19:16:08	1.1.1.1
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/scrolled-window.lisp	2011/09/15 10:28:21	1.2
@@ -9,18 +9,36 @@
                          &key hadj vadj &allow-other-keys)
   (gtk-scrolled-window-new hadj vadj))
 
-(defcenum policy
-  :always :automatic :never)
+(defgtkslots scrolled-window
+    hadjustment pobject
+    vadjustment pobject
+    shadow-type shadow-type
+    placement corner-type
+    min-content-width :int
+    min-content-height :int)
 
-(defcfun "gtk_scrolled_window_set_policy" :void (win :pointer)
-  (hpol policy) (vpol policy))
+(defgtkfuns scrolled-window
+  (unset-placement :void)
+  (add-with-viewport :void (child pobject)))
 
+
+(defcfun gtk-scrolled-window-set-policy :void 
+  (win pobject) (hpol policy) (vpol policy))
+
+(defgeneric (setf policy) (policy scrolled-window))
 (defmethod (setf policy) (policy (scrolled-window scrolled-window))
-  (gtk-scrolled-window-set-policy (pointer scrolled-window)
+  (gtk-scrolled-window-set-policy scrolled-window
                                   (first policy)
                                   (second policy)))
+(save-setter scrolled-window policy)
+
+(defcfun gtk-scrolled-window-get-policy :void
+  (win pobject) (hpol :pointer) (vpol :pointer))
+
+
+(defgeneric policy (scrolled-window))
+(defmethod policy ((scrolled-window scrolled-window))
+  (with-foreign-outs-list ((hpol 'policy) (vpol 'policy)) :ignore
+      (gtk-scrolled-window-get-policy scrolled-window hpol vpol)))
 
-(defmethod initialize-instance :after ((scrolled-window scrolled-window)
-                                       &key (policy '(:automatic :automatic))
-                                       &allow-other-keys)
-  (setf-init scrolled-window policy))
\ No newline at end of file
+(init-slots scrolled-window)
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/statusbar.lisp	2011/09/11 15:48:21	1.2
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/statusbar.lisp	2011/09/15 10:28:21	1.3
@@ -19,7 +19,8 @@
 (defcfun gtk-statusbar-remove-all :void
   (statusbar pobject) (context-id :uint))
 
-(defmethod statusbar-remove ((statusbar statusbar) context-id message-id)
+(defmethod statusbar-remove ((statusbar statusbar) context-id 
+                             &optional message-id)
   (if message-id
       (gtk-statusbar-remove statusbar context-id message-id)
       (gtk-statusbar-remove-all statusbar context-id)))