X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=gtk%2Fgtk.status-bar.lisp;h=b0313a26130317cb1c1f8a09a5c649ff39f7ed0c;hb=96aa7293addaacdfe29ce32e60e2feac7df6ffce;hp=45cc2c7a63473e5d2f2e587d7ca44b3a667b57e5;hpb=0d03b82a77743d2ea5ef69bea08735fa12857d92;p=cl-gtk2.git

diff --git a/gtk/gtk.status-bar.lisp b/gtk/gtk.status-bar.lisp
index 45cc2c7..b0313a2 100644
--- a/gtk/gtk.status-bar.lisp
+++ b/gtk/gtk.status-bar.lisp
@@ -1,32 +1,38 @@
 (in-package :gtk)
 
-(defcfun gtk-statusbar-get-context-id :uint
-  (status-bar (g-object statusbar))
+(defcfun (statusbar-get-context-id "gtk_statusbar_get_context_id") :uint
+  (statusbar (g-object statusbar))
   (context-description :string))
 
 (defcfun gtk-statusbar-push :uint
-  (status-bar (g-object statusbar))
+  (statusbar (g-object statusbar))
   (context-id :uint)
   (text :string))
 
 (defcfun gtk-statusbar-pop :void
-  (status-bar (g-object statusbar))
+  (statusbar (g-object statusbar))
   (context-id :uint))
 
 (defcfun gtk-statusbar-remove :void
-  (status-bar (g-object statusbar))
+  (statusbar (g-object statusbar))
   (context-id :uint)
   (message-id :uint))
 
-(defun status-bar-push (status-bar context text)
-  (gtk-statusbar-push status-bar (gtk-statusbar-get-context-id status-bar context) text))
+(defun statusbar-context-id (statusbar context)
+  (etypecase context
+    (integer context)
+    (string (statusbar-get-context-id statusbar context))))
 
-(defun status-bar-pop (status-bar context)
-  (gtk-statusbar-pop status-bar (gtk-statusbar-get-context-id status-bar context)))
+(defun statusbar-push (statusbar context text)
+  (gtk-statusbar-push statusbar (statusbar-context-id statusbar context) text))
 
-(defun status-bar-remove (status-bar context message-id)
-  (gtk-statusbar-remove status-bar (gtk-statusbar-get-context-id status-bar context) message-id))
+(defun statusbar-pop (statusbar context)
+  (gtk-statusbar-pop statusbar (statusbar-context-id statusbar context)))
 
-(export 'status-bar-push)
-(export 'status-bar-pop)
-(export 'status-bar-remove)
\ No newline at end of file
+(defun statusbar-remove (statusbar context message-id)
+  (gtk-statusbar-remove statusbar (statusbar-context-id statusbar context) message-id))
+
+(export 'statusbar-push)
+(export 'statusbar-pop)
+(export 'statusbar-remove)
+(export 'statusbar-context-id)
\ No newline at end of file