diff --git a/gcontext.lisp b/gcontext.lisp index 3176c76..259bee6 100644 --- a/gcontext.lisp +++ b/gcontext.lisp @@ -226,7 +226,7 @@ (def-gc-accessor foreground card32) (def-gc-accessor background card32) (def-gc-accessor line-width card16) -(def-gc-accessor line-style (member :solid :on-off-dash :double-dash)) +(def-gc-accessor line-style (member :solid :dash :double-dash)) (def-gc-accessor cap-style (member :not-last :butt :round :projecting)) (def-gc-accessor join-style (member :miter :round :bevel)) (def-gc-accessor fill-style (member :solid :tiled :stippled :opaque-stippled)) diff --git a/manual/clx.texinfo b/manual/clx.texinfo index 354553e..624c32a 100644 --- a/manual/clx.texinfo +++ b/manual/clx.texinfo @@ -5796,7 +5796,7 @@ than the odd dashes. The @var{:butt} style is used where even and odd dashes meet (see paragraph 5.4.7, Fill-Rule and Fill-Style). -@item :on-off-dash +@item :dash Only the even dashes are drawn, with cap-style applied to all internal ends of the individual dashes, except @var{:not-last} is treated as @var{:butt}. @@ -5804,7 +5804,7 @@ ends of the individual dashes, except @var{:not-last} is treated as @table @var @item line-style -One of @var{:on-off-dash}, @var{:double-dash}, or @var{:solid}. +One of @var{:dash}, @var{:double-dash}, or @var{:solid}. @end table @end defun diff --git a/tests/core-protocol.lisp b/tests/core-protocol.lisp index 0532c90..52b16d8 100644 --- a/tests/core-protocol.lisp +++ b/tests/core-protocol.lisp @@ -426,11 +426,11 @@ (is (equalp (xlib:gcontext-join-style gc) :round)) (is (member (xlib:gcontext-line-style gc) '(:solid :double-dash - :on-off-dash))) + :dash))) (finishes (setf (xlib:gcontext-line-style gc) :double-dash)) (is (equalp (xlib:gcontext-line-style gc) :double-dash)) - (finishes (setf (xlib:gcontext-line-style gc) :on-off-dash)) - (is (equalp (xlib:gcontext-line-style gc) :on-off-dash)) + (finishes (setf (xlib:gcontext-line-style gc) :dash)) + (is (equalp (xlib:gcontext-line-style gc) :dash)) (is (typep (xlib:gcontext-line-width gc) 'xlib:card16)) (is (xlib:gcontext-p gc)) (is (not (xlib:gcontext-p root-window)))