Replaced deprecated widgets combo and option-menu with combo-box and combo-box-entry

[clg] / gtk / gtkutils.lisp

diff --git a/gtk/gtkutils.lisp b/gtk/gtkutils.lisp
index 08393a02dbb7dc03998fae69d151219cc64b4552..bd11006e1e8ba5126c2dacc2877adeff9e18ac3a 100644 (file)
--- a/gtk/gtkutils.lisp
+++ b/gtk/gtkutils.lisp
@@ -15,37 +15,42 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 

-;; $Id: gtkutils.lisp,v 1.1 2000-10-05 17:21:46 espen Exp $
+;; $Id: gtkutils.lisp,v 1.3 2004-11-07 17:55:29 espen Exp $

 
 
 (in-package "GTK")
 
 
 
 (in-package "GTK")
 

-(defun create-button (specs &optional callback &rest args)
+(defun create-button (specs &optional callback &key object)

   (destructuring-bind (label &rest initargs) (mklist specs)
     (let ((button
           (apply #'make-instance 'button :label label :visible t initargs)))
       (if callback
   (destructuring-bind (label &rest initargs) (mklist specs)
     (let ((button
           (apply #'make-instance 'button :label label :visible t initargs)))
       (if callback

-         (signal-connect
-          button 'clicked
-          #'(lambda ()
-              (apply (funcallable callback) args)))
+         (signal-connect button 'clicked callback :object object)

        (setf (widget-sensitive-p button) nil))
       button)))
 
        (setf (widget-sensitive-p button) nil))
       button)))
 

-(defun %create-toggleable-button (class label callback state args)
-  (let ((button (make-instance class :label label :active state :visible t)))
+
+(defun create-label (label &rest args)
+  (apply #'make-instance 'label :label label args))
+  
+
+;; TODO: same syntax as create-button
+(defun %create-toggleable-button (class label callback initstate initargs)
+  (let ((button 
+        (apply #'make-instance class :label label :active initstate :visible t
+               initargs)))

     (signal-connect
      button 'toggled
      #'(lambda ()
     (signal-connect
      button 'toggled
      #'(lambda ()

-        (apply (funcallable callback) (toggle-button-active-p button) args)))
-    (apply (funcallable callback) state args)
+        (funcall (funcallable callback) (toggle-button-active-p button))))
+    (funcall (funcallable callback) initstate)

     button))
 
     button))
 

-(defun create-toggle-button (label callback &optional state &rest args)
-  (%create-toggleable-button 'toggle-button label callback state args))
+(defun create-toggle-button (label callback &optional initstate &rest initargs)
+  (%create-toggleable-button 'toggle-button label callback initstate initargs))

 
 

-(defun create-check-button (label callback &optional state &rest args)
-  (%create-toggleable-button 'check-button label callback state args))
+(defun create-check-button (label callback &optional initstate &rest initargs)
+  (%create-toggleable-button 'check-button label callback initstate initargs))

 
 (defun create-radio-button-group (specs active &optional callback &rest args)
   (let ((group nil)
 
 (defun create-radio-button-group (specs active &optional callback &rest args)
   (let ((group nil)


@@ -80,33 +85,8 @@ (defun create-radio-button-group (specs active &optional callback &rest args)
             button)))
      specs)))
 
             button)))
      specs)))
 

-(defun create-option-menu (specs active &optional callback &rest args)
-  (let ((menu (make-instance 'menu))
-       (group nil)
-       (i 0))
-    (dolist (spec specs)
-      (destructuring-bind (label &optional object &rest initargs) (mklist spec)
-       (let ((menu-item
-              (apply
-               #'make-instance 'radio-menu-item
-               :label label :active (= i active) initargs)))
-         (when group (%radio-menu-item-set-group menu-item group))
-         (setq group (%radio-menu-item-get-group menu-item))
-         (cond
-          (callback
-           (signal-connect
-            menu-item 'activated
-            #'(lambda ()
-                (apply (funcallable callback) object args))))
-          (object
-           (signal-connect
-            menu-item 'toggled
-            #'(lambda ()
-                (apply
-                 (funcallable object)
-                 (check-menu-item-active-p menu-item) args)))))
-         (incf i)
-         (menu-shell-append menu menu-item))))
-    
-    (make-instance 'option-menu :history active :menu menu)))

 
 

+(defun adjustment-new (value lower upper step-increment page-increment page-size)
+  (make-instance 'adjustment 
+   :value value :lower lower :upper upper :step-increment step-increment
+   :page-increment page-increment :page-size page-size))