--- a/tests/glyph-test.el	Mon Aug 13 11:23:14 2007 +0200
+++ b/tests/glyph-test.el	Mon Aug 13 11:24:09 2007 +0200
@@ -17,43 +17,56 @@
  (make-extent (point) (point))
  (make-glyph [button :descriptor ["ok" (setq ok-select nil) :style radio 
 				  :selected (not ok-select)]]))
+;; toggle button
+(set-extent-begin-glyph 
+ (make-extent (point) (point))
+ (setq tbutton
+       (make-glyph [button :descriptor ["ok" (setq ok-select nil) 
+					:style toggle 
+					:selected (not ok-select)]])))
+(set-extent-begin-glyph 
+ (make-extent (point) (point))
+ (make-glyph [button :descriptor ["ok" :style toggle 
+				  :callback 
+				  (setq ok-select (not ok-select))
+				  :selected ok-select]]))
+
 ;; normal pushbutton
 (set-extent-begin-glyph 
  (make-extent (point) (point))
  (setq pbutton (make-glyph 
-		[button :width 10 :height 2 
+		[button :width 10 :height 2
 			:face modeline-mousable
 			:descriptor "ok" :callback foo 
 			:selected t])))
-
 ;; tree view
 (set-extent-begin-glyph 
  (make-extent (point) (point))
  (setq tree (make-glyph 
-	       [tree :width 10
-		     :descriptor "My Tree"
-		     :properties (:items (["One" foo]
-					  (["Two" foo]
-					   ["Four" foo]
-					   "Six")
-					  "Three"))])))
+	     [tree-view :width 10
+			:descriptor "My Tree"
+			:properties (:items (["One" foo]
+					     (["Two" foo]
+					      ["Four" foo]
+					      "Six")
+					     "Three"))])))
 
 ;; tab control
 (set-extent-begin-glyph 
  (make-extent (point) (point))
  (setq tab (make-glyph 
-	    [tab :descriptor "My Tab"
-		 :face default
-		 :properties (:items (["One" foo]
-				      ["Two" foo]
-				      ["Three" foo]))])))
+	    [tab-control :descriptor "My Tab"
+			 :face default
+			 :properties (:items (["One" foo]
+					      ["Two" foo]
+					      ["Three" foo]))])))
 
 ;; progress gauge
 (set-extent-begin-glyph 
  (make-extent (point) (point))
  (setq pgauge (make-glyph 
-	       [progress :width 10 :height 2 
-			 :descriptor "ok"])))
+	       [progress-gauge :width 10 :height 2 
+			       :descriptor "ok"])))
 ;; progress the progress ...
 (let ((x 0))
   (while (<= x 100)
@@ -65,8 +78,8 @@
 (setq global-mode-string 
       (cons (make-extent nil nil)
 	    (setq pg (make-glyph 
-		      [progress :width 5 :pixel-height 16
-				:descriptor "ok"]))))
+		      [progress-gauge :width 5 :pixel-height 16
+				      :descriptor "ok"]))))
 ;; progress the progress ...
 (let ((x 0))
   (while (<= x 100)
@@ -90,15 +103,15 @@
 ;; edit box
 (set-extent-begin-glyph 
  (make-extent (point) (point)) 
- (setq hedit (make-glyph [edit :pixel-width 50 :pixel-height 30
-			       :face bold-italic
-			       :descriptor ["Hello"]])))
+ (setq hedit (make-glyph [edit-field :pixel-width 50 :pixel-height 30
+				     :face bold-italic
+				     :descriptor ["Hello"]])))
 ;; combo box
 (set-extent-begin-glyph 
  (make-extent (point) (point))
  (setq hcombo (make-glyph 
-	       [combo :width 10 :height 3 :descriptor ["Hello"] 
-		      :properties (:items ("One" "Two" "Three"))])))
+	       [combo-box :width 10 :height 3 :descriptor ["Hello"] 
+			  :properties (:items ("One" "Two" "Three"))])))
 
 ;; line
 (set-extent-begin-glyph 
@@ -111,6 +124,6 @@
 ; (make-glyph [scrollbar :width 50 :height 20 :descriptor ["Hello"]]))
 
 ;; generic subwindow
-(setq sw (make-glyph [subwindow :pixel-width 50 :pixel-height 50]))
+(setq sw (make-glyph [subwindow :pixel-width 50 :pixel-height 70]))
 (set-extent-begin-glyph (make-extent (point) (point)) sw)