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

Modified Files:
	package.lisp statusbar.lisp 
Removed Files:
	pango.lisp 
Log Message:
Added GdkKeymap


--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/package.lisp	2011/08/28 15:38:31	1.5
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/package.lisp	2011/09/11 15:48:21	1.6
@@ -386,6 +386,11 @@
    #:notebook
 
    #:statusbar
+   #:context-id
+   #:statusbar-push
+   #:statusbar-pop
+   #:statusbar-remove
+   #:message-area
 
    #:icon-source
 
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/statusbar.lisp	2011/04/25 19:16:08	1.1.1.1
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/statusbar.lisp	2011/09/11 15:48:21	1.2
@@ -5,30 +5,21 @@
 
 (defcfun "gtk_statusbar_new" :pointer)
 
-(defmethod gconstructor ((statusbar statusbar) &rest rest)
-  (declare (ignore rest))
+(defmethod gconstructor ((statusbar statusbar) &key &allow-other-keys)
   (gtk-statusbar-new))
 
-(defcfun "gtk_statusbar_push" :uint
-  (statusbar pobject) (context-id :uint) (text gtk-string))
+(defgtkfuns statusbar
+  ((statusbar-push . push) :uint (context-id :uint) (text gtk-string))
+  ((statusbar-pop . pop) :void (context-id :uint))
+  (:get context-id :uint (context gtk-string))
+  (:get message-area pobject))
 
-(defmethod push-message ((statusbar statusbar) context-id message)
-  (gtk-statusbar-push statusbar context-id message))
-
-(defcfun "gtk_statusbar_pop" :void
-  (statusbar pobject) (context-id :uint))
-
-(defmethod pop-message ((statusbar statusbar) context-id)
-  (gtk-statusbar-pop statusbar context-id))
-
-(defcfun "gtk_statusbar_remove" :void
+(defcfun gtk-statusbar-remove :void
   (statusbar pobject) (context-id :uint) (message-id :uint))
+(defcfun gtk-statusbar-remove-all :void
+  (statusbar pobject) (context-id :uint))
 
-(defmethod remove-message ((statusbar statusbar) context-id message-id)
-  (gtk-statusbar-remove statusbar context-id message-id))
-
-(defcfun "gtk_statusbar_get_context_id" :uint
-  (statusbar pobject) (context gtk-string))
-
-(defmethod get-context-id ((statusbar statusbar) context)
-  (gtk-statusbar-get-context-id statusbar context))
\ No newline at end of file
+(defmethod statusbar-remove ((statusbar statusbar) context-id message-id)
+  (if message-id
+      (gtk-statusbar-remove statusbar context-id message-id)
+      (gtk-statusbar-remove-all statusbar context-id)))