diff options
| -rwxr-xr-x | demo2.tl | 13 | ||||
| -rw-r--r-- | demostuff.tl | 2 |
2 files changed, 8 insertions, 7 deletions
@@ -10,20 +10,23 @@ (button b23 (bnt 3) mainbox2 (xnum (bn 3))) (button b24 (bnt 4) mainbox2 (xnum (bn 4))) (button b25 (bnt 5) mainbox2 (xnum (bn 5))) - (button numeralbutton2 "Numerals" mainbox2 (togglenumar)) + (button numeralbutton2 "Dec/Hex" mainbox2 (togglenumar)) (text num2 "zero" numbox2) (gtk_widget_show_all demo2)) -(defparameter numar 'a) ; 'r = I II II IV V. 'a = 1 2 3 4 5. +(defparm numar 'dec) ;; dec or hex + +(defparm toggle (relate '(dec hex) '(hex dec))) ; Button number (bn) and button number text (bnt): (defun bn (n) (nth (pred n) '(11 22 33 44 55))) -(defun bnt (n) (format nil (if (eq numar 'a) "~d" "~@R") (bn n))) + +(defun bnt (n) (format nil (if (eq numar 'a) "~d" "~x") (bn n))) (defun togglenumar () - (set numar (if (eq numar 'a) 'r 'a)) + (upd numar toggle) (each ((button (list b21 b22 b23 b24 b25)) (n (range 1 5))) (xlabel button (bnt n)))) -(defun xnum (n) (xtext num2 (format nil "~R" n))) +(defun xnum (n) (xtext num2 (format nil "~d" n))) diff --git a/demostuff.tl b/demostuff.tl index 4ec23ab..faad59f 100644 --- a/demostuff.tl +++ b/demostuff.tl @@ -120,5 +120,3 @@ ,*body) (set ,theapp (gtk_application_new nil 0)) (g_signal_connect_data ,theapp "activate" [app-cb ,cb] null null 0)))) - -(defmacro defparameter (name val) ^(defparm ,name ,val)) |