[mcclim-cvs] CVS mcclim/Examples

[ahefner]

Update of /project/mcclim/cvsroot/mcclim/Examples
In directory clnet:/tmp/cvs-serv18882

Modified Files:
	calculator.lisp clim-fig.lisp demodemo.lisp sliderdemo.lisp 
Log Message:
Cleanup pane names in examples - always use the abstract pane name,
rather than the concrete name (push-button vs. push-button-pane),
so that the frame manager can choose.



--- /project/mcclim/cvsroot/mcclim/Examples/calculator.lisp	2005/02/01 03:11:39	1.18
+++ /project/mcclim/cvsroot/mcclim/Examples/calculator.lisp	2006/12/19 04:08:58	1.19
@@ -89,7 +89,7 @@
 (defun make-button (label operator &key width height
                                         (max-width +fill+) min-width
                                         (max-height +fill+) min-height)
-  (make-pane 'push-button-pane
+  (make-pane 'push-button
 	     :label label
 	     :activate-callback operator
              :text-style *calculator-text-style*
--- /project/mcclim/cvsroot/mcclim/Examples/clim-fig.lisp	2006/11/10 18:36:57	1.29
+++ /project/mcclim/cvsroot/mcclim/Examples/clim-fig.lisp	2006/12/19 04:08:58	1.30
@@ -146,7 +146,7 @@
  )
 
 (defun make-colored-button (color &key width height)
-  (make-pane 'push-button-pane
+  (make-pane 'push-button
 	     :label " "
 	     :activate-callback
              #'(lambda (gadget)
@@ -158,7 +158,7 @@
 	     :highlighted color))
 
 (defun make-drawing-mode-button (label mode &key width height)
-  (make-pane 'push-button-pane
+  (make-pane 'push-button
 	     :label label
 	     :activate-callback
              #'(lambda (gadget)
--- /project/mcclim/cvsroot/mcclim/Examples/demodemo.lisp	2006/07/03 04:58:41	1.13
+++ /project/mcclim/cvsroot/mcclim/Examples/demodemo.lisp	2006/12/19 04:08:58	1.14
@@ -91,12 +91,12 @@
      (default
          (horizontally (:background climi::*3d-normal-color*)
            30
-           (make-pane 'push-button-pane :label "Okay"
+           (make-pane 'push-button :label "Okay"
                       :width '(50 :mm))
            '+fill+
-           (make-pane 'push-button-pane :label "Cancel")
+           (make-pane 'push-button :label "Cancel")
            '+fill+
-           (make-pane 'push-button-pane :label "Help")
+           (make-pane 'push-button :label "Help")
            5
            ) )))
 
@@ -105,10 +105,10 @@
     (:layouts
      (default
          (tabling (:background +red+)
-           (list (make-pane 'push-button-pane :label "Last Name" :max-height +fill+)
-                 (make-pane 'push-button-pane :label "First Name" #||:max-height +fill+||#))
-           (list (make-pane 'push-button-pane :label "C 1 0")
-                 (make-pane 'push-button-pane :label "C 1 1"))
+           (list (make-pane 'push-button :label "Last Name" :max-height +fill+)
+                 (make-pane 'push-button :label "First Name" #||:max-height +fill+||#))
+           (list (make-pane 'push-button :label "C 1 0")
+                 (make-pane 'push-button :label "C 1 1"))
            ) )))
 
 (defun make-test-label (ax ay)
@@ -118,7 +118,7 @@
                      :foreground +WHITE+
                      :background +PALETURQUOISE4+
                      :text-style (make-text-style :sans-serif :roman :normal))
-    (make-pane 'push-button-pane :label (format nil "~S" (list ax ay))
+    (make-pane 'push-button :label (format nil "~S" (list ax ay))
                :text-style (make-text-style :sans-serif :roman :normal)
                :max-width 1000
                :max-height 1000)))
@@ -131,7 +131,7 @@
                      :background +PALETURQUOISE4+
                      :text-style (make-text-style :sans-serif :roman :normal))
     #+nil
-    (make-pane 'push-button-pane :label 
+    (make-pane 'push-button :label 
                :text-style (make-text-style :sans-serif :roman :normal)
                :max-width 1000
                :max-height 1000)))
--- /project/mcclim/cvsroot/mcclim/Examples/sliderdemo.lisp	2003/03/21 21:37:00	1.4
+++ /project/mcclim/cvsroot/mcclim/Examples/sliderdemo.lisp	2006/12/19 04:08:58	1.5
@@ -75,7 +75,7 @@
   (setf (gadget-value *text-field*) (princ-to-string value)))
 
 (defun find-text-field (frame)
-  (first (member-if #'(lambda (gadget) (typep gadget 'text-field-pane))
+  (first (member-if #'(lambda (gadget) (typep gadget 'text-field))
 		    (frame-panes frame))))
 
 (defmethod sliderdemo-frame-top-level ((frame application-frame)