diff options
| author | Daniel Kochmański <daniel@turtleware.eu> | 2024-07-26 10:03:53 +0200 |
|---|---|---|
| committer | Daniel Kochmański <daniel@turtleware.eu> | 2024-09-17 09:02:28 +0200 |
| commit | 64b34f35b6af94575f5e2b4b95eda093ac516fed (patch) | |
| tree | 0a072c8d4f6614c34ad214b6b2479c808cb8f969 | |
| parent | 22010737a082cf954b760862d8e66fe3c4b8f489 (diff) | |
core: remove superfluous mixins for pane I/O
There were two mixins CLIM-SHEET-INPUT-MIXIN and STANDARD-SHEET-INPUT-MIXIN that
were acting as an intermediate between silex I/O classes and basic-pane
superclasses -- this was redundant with STANDARD-*-MIXIN, so we remove it.
| -rw-r--r-- | Core/clim-core/panes/construction.lisp | 4 | ||||
| -rw-r--r-- | Core/windowing/input.lisp | 5 | ||||
| -rw-r--r-- | Core/windowing/protocol.lisp | 2 | ||||
| -rw-r--r-- | Core/windowing/repaint.lisp | 6 |
4 files changed, 2 insertions, 15 deletions
diff --git a/Core/clim-core/panes/construction.lisp b/Core/clim-core/panes/construction.lisp index 9183fd68..b5673c87 100644 --- a/Core/clim-core/panes/construction.lisp +++ b/Core/clim-core/panes/construction.lisp @@ -201,8 +201,8 @@ returned or error is signaled depending on the argument ERRORP.") always-repaint-background-mixin mouse-wheel-scroll-mixin permanent-medium-sheet-output-mixin - clim-repainting-mixin - clim-sheet-input-mixin + immediate-repainting-mixin + standard-sheet-input-mixin sheet-transformation-mixin layout-protocol-mixin pane diff --git a/Core/windowing/input.lisp b/Core/windowing/input.lisp index 651650f0..a80646c2 100644 --- a/Core/windowing/input.lisp +++ b/Core/windowing/input.lisp @@ -175,8 +175,3 @@ &key (timeout nil) (wait-function nil)) (event-listen-or-wait (delegate-sheet-delegate sheet) :timeout timeout :wait-function wait-function)) - -;;; Class actually used by panes. - -(defclass clim-sheet-input-mixin (standard-sheet-input-mixin) - ()) diff --git a/Core/windowing/protocol.lisp b/Core/windowing/protocol.lisp index f28775d7..69cbd264 100644 --- a/Core/windowing/protocol.lisp +++ b/Core/windowing/protocol.lisp @@ -169,7 +169,6 @@ is not empty or none of the above happened before a timeout. (pledge :mixin sheet-mute-input-mixin) (pledge :mixin delegate-sheet-input-mixin) (define-accessor delegate-sheet-delegate (new-value instance)) -(pledge :mixin clim-sheet-input-mixin) ;;; 8.2 Standard Device Events (define-protocol-class event nil nil (:default-initargs :timestamp nil)) @@ -284,7 +283,6 @@ and button states of the pointer.")) (pledge :mixin sheet-mute-repainting-mixin) (pledge :mixin always-repaint-background-mixin) (pledge :mixin never-repaint-background-mixin) -(pledge :mixin clim-repainting-mixin) ;;; 8.5 Sheet Notification Protocol diff --git a/Core/windowing/repaint.lisp b/Core/windowing/repaint.lisp index 249ffc5c..182d1b05 100644 --- a/Core/windowing/repaint.lisp +++ b/Core/windowing/repaint.lisp @@ -146,12 +146,6 @@ (declare (ignore sheet region)) (values)) -(defclass clim-repainting-mixin (immediate-repainting-mixin) - ;; (#+clim-mp standard-repainting-mixin #-clim-mp immediate-repainting-mixin) - () - (:documentation "Internal class that implements the repainting protocol.")) - - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; ;;; No Standard. |