Update of /project/mcclim/cvsroot/mcclim
In directory clnet:/tmp/cvs-serv22060
Modified Files:
package.lisp panes.lisp
Log Message:
Move the cut/paste and mouse scroll mixins from clim-stream-pane into
subclasses, so that it's possible to implement subclasses of
clim-stream-pane without them (presumably, if you want the extra
features beyond the spec, you'll inherit from application-pane anyway).
Move the mixin names into clim-extensions to make them accessible to the
user.
--- /project/mcclim/cvsroot/mcclim/package.lisp 2008/05/01 06:48:23 1.69
+++ /project/mcclim/cvsroot/mcclim/package.lisp 2008/08/21 22:34:28 1.70
@@ -1955,6 +1955,8 @@
#:draw-rounded-rectangle*
#:highlight-output-record-tree
+ #:cut-and-paste-mixin
+ #:mouse-wheel-scroll-mixin
;; Font listing extension:
#:font-family
--- /project/mcclim/cvsroot/mcclim/panes.lisp 2008/05/09 19:12:14 1.190
+++ /project/mcclim/cvsroot/mcclim/panes.lisp 2008/08/21 22:34:29 1.191
@@ -27,7 +27,7 @@
;;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
;;; Boston, MA 02111-1307 USA.
-;;; $Id: panes.lisp,v 1.190 2008/05/09 19:12:14 thenriksen Exp $
+;;; $Id: panes.lisp,v 1.191 2008/08/21 22:34:29 ahefner Exp $
(in-package :clim-internals)
@@ -2489,9 +2489,7 @@
standard-output-recording-stream
;; sheet-leaf-mixin
sheet-multiple-child-mixin ; needed for GADGET-OUTPUT-RECORD
- basic-pane
- mouse-wheel-scroll-mixin
- cut-and-paste-mixin)
+ basic-pane)
((redisplay-needed :initarg :display-time)
(scroll-bars :type scroll-bar-spec ; (member t :vertical :horizontal nil)
:initform nil
@@ -2682,7 +2680,9 @@
;;; INTERACTOR PANES
-(defclass interactor-pane (clim-stream-pane)
+(defclass interactor-pane (clim-stream-pane
+ cut-and-paste-mixin
+ mouse-wheel-scroll-mixin)
()
(:default-initargs :display-time nil
:end-of-line-action :scroll
@@ -2710,7 +2710,9 @@
;;; APPLICATION PANES
-(defclass application-pane (clim-stream-pane)
+(defclass application-pane (clim-stream-pane
+ cut-and-paste-mixin
+ mouse-wheel-scroll-mixin)
()
(:default-initargs :display-time :command-loop
:scroll-bars t))
@@ -2832,7 +2834,9 @@
;;; 29.4.5 Creating a Standalone CLIM Window
-(defclass window-stream (clim-stream-pane)
+(defclass window-stream (clim-stream-pane
+ cut-and-paste-mixin
+ mouse-wheel-scroll-mixin)
())
(defmethod close ((stream window-stream)
