suzanne.soy/gui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

"Mac OS X" -> "Mac OS"

Browse Source
This commit is contained in:
Matthew Flatt 2016-12-23 12:33:59 -07:00
parent 141eee8cbc
commit 5a09d2b825
34 changed files with 123 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui-doc/scribblings/gui/blurbs.rkt
View File

@ -27,7 +27,7 @@
@elem{If @litchar{&} occurs in @|where|, it is specially parsed;
under Windows and X, the character
following @litchar{&} is underlined in the displayed control to
indicate a keyboard mnemonic. (Under Mac OS X, mnemonic underlines are
indicate a keyboard mnemonic. (Under Mac OS, mnemonic underlines are
not shown.) The mnemonic is meaningless for a @|what| (as far as
@xmethod[top-level-window<%> on-traverse-char] is concerned),
but it is supported for consistency with other control types. A

7
gui-doc/scribblings/gui/button-class.scrbl
View File

@ -36,7 +36,7 @@ Creates a button with a string label, bitmap label, or both.
If @litchar{&} occurs in @racket[label] (when @racket[label] includes a
string), it is specially parsed; on Windows and Unix, the character
following @litchar{&} is underlined in the displayed control to
indicate a keyboard mnemonic. (On Mac OS X, mnemonic underlines are
indicate a keyboard mnemonic. (On Mac OS, mnemonic underlines are
not shown.) The underlined mnemonic character must be a letter or a
digit. The user can effectively click the button by typing the
mnemonic when the control's top-level-window contains the keyboard
@ -45,14 +45,13 @@ keyboard focus is currently in a control that handles normal
alphanumeric input. The @litchar{&} itself is removed from
@racket[label] before it is displayed for the control; a @litchar{&&}
in @racket[label] is converted to @litchar{&} (with no mnemonic
underlining). On Mac OS X, a parenthesized mnemonic character is
underlining). On Mac OS, a parenthesized mnemonic character is
removed (along with any surrounding space) before the label is
displayed, since a parenthesized mnemonic is often used for non-Roman
languages. Finally, for historical reasons, any text after a tab character is removed on all
platforms. All of these rules are consistent with label handling in
menu items (see @method[labelled-menu-item<%> set-label]). Mnemonic keyboard events are handled by
@method[top-level-window<%> on-traverse-char] (but not on Mac OS
X).
@method[top-level-window<%> on-traverse-char] (but not on Mac OS).
The @racket[callback] procedure is called (with the event type
@indexed-racket['button]) whenever the user clicks the button.

2
gui-doc/scribblings/gui/canvas-class.scrbl
View File

@ -107,7 +107,7 @@ Returns the canvas's drawing-area dimensions in OpenGL units for a
The result is the same as @method[canvas<%> get-scaled-client-size]
in a canvas without the @racket['gl] style or on Windows and Unix. On
Mac OS X, the result can be the same as @method[window<%>
Mac OS, the result can be the same as @method[window<%>
get-client-size] if the @racket[gl-config%] specification provided on
creation does not specify high-resolution mode.

6
gui-doc/scribblings/gui/canvas-intf.scrbl
View File

@ -144,7 +144,7 @@ Returns the canvas's drawing-area dimensions in unscaled pixels---that
is, without scaling (see @secref["display-resolution"]) that is
implicitly applied to the canvas size and content.
For example, when a canvas on Mac OS X resides on a Retina display, it
For example, when a canvas on Mac OS resides on a Retina display, it
has a backing scale of @racket[2], and so the results from
@method[canvas<%> get-scaled-client-size] will be twice as large as results from
@method[window<%> get-client-size]. If the same canvas's frame is dragged to a
@ -155,7 +155,7 @@ a canvas's backing scale can change depends on the platform.
The size reported by @method[canvas<%> get-scaled-client-size] may match
a viewport size for OpenGL drawing in @racket[canvas%] instance with
the @racket['gl] style. On Mac OS X, however, the viewport will match
the @racket['gl] style. On Mac OS, however, the viewport will match
the scaled size unless the canvas is created with a
@racket[gl-config%] specification that is adjusted to high-resolution
mode via @method[gl-config% set-hires-mode]. See also
@ -300,7 +300,7 @@ If the canvas was created with the @indexed-racket['transparent] style,
@defmethod[(set-resize-corner [on? any/c])
void?]{
On Mac OS X, enables or disables space for a resize tab at the
On Mac OS, enables or disables space for a resize tab at the
canvas's lower-right corner when only one scrollbar is visible. This
method has no effect on Windows or Unix, and it has no effect when
both or no scrollbars are visible. The resize corner is disabled by

2
gui-doc/scribblings/gui/clipboard-client-class.scrbl
View File

@ -25,7 +25,7 @@ Adds a new data format name to the list supported by the clipboard
client.
The @racket[format] string is typically four capital letters. (On
Mac OS X, only four characters for @racket[format] are ever used.)
Mac OS, only four characters for @racket[format] are ever used.)
For example, @racket["TEXT"] is the name of the UTF-8-encoded string
format. New format names can be used to communicate application- and
platform-specific data formats.

6
gui-doc/scribblings/gui/clipboard-intf.scrbl
View File

@ -14,7 +14,7 @@ On Unix, a second @racket[clipboard<%>] object,
@racket[the-x-selection-clipboard], and the system-wide X11 clipboard
is not used.
On Windows and Mac OS X, @racket[the-x-selection-clipboard] is
On Windows and Mac OS, @racket[the-x-selection-clipboard] is
always the same as @racket[the-clipboard].
Data can be entered into a clipboard in one of two ways: by setting
@ -31,7 +31,7 @@ Generic data is always retrieved from the clipboard as a byte
@defmethod[(get-clipboard-bitmap [time exact-integer?])
(or/c (is-a?/c bitmap%) #f)]{
Gets the current clipboard contents as a bitmap (Windows, Mac OS X),
Gets the current clipboard contents as a bitmap (Windows, Mac OS),
returning @racket[#f] if the clipboard does not contain a bitmap.
See
@ -92,7 +92,7 @@ Returns @racket[#t] if @racket[owner] currently owns the clipboard,
[time exact-integer?])
void?]{
Changes the current clipboard contents to @racket[new-bitmap] (Windows, Mac OS X)
Changes the current clipboard contents to @racket[new-bitmap] (Windows, Mac OS)
and releases the current clipboard client (if any).
See @|timediscuss| for

10
gui-doc/scribblings/gui/dialog-class.scrbl
View File

@ -44,7 +44,7 @@ If @racket[parent] is @racket[#f], then the eventspace for the new
If the @racket[width] or @racket[height] argument is not @racket[#f],
it specifies an initial size for the dialog (in pixels) assuming that
it is larger than the minimum size, otherwise the minimum size is
used. On Windows and Mac OS X (and with some Unix window managers)
used. On Windows and Mac OS (and with some Unix window managers)
dialogs are not resizeable.
If the @racket[x] or @racket[y] argument is not @racket[#f], it
@ -61,14 +61,14 @@ The @racket[style] flags adjust the appearance of the dialog on some
(Windows)}
@item{@racket['resize-border] --- adds a resizeable border around the
window (Windows), ability to resize the window (Mac OS X), or grow
box in the bottom right corner (older Mac OS X)}
window (Windows), ability to resize the window (Mac OS), or grow
box in the bottom right corner (older Mac OS)}
@item{@racket['no-sheet] --- uses a movable window for the dialog,
even if a parent window is provided (Mac OS X)}
even if a parent window is provided (Mac OS)}
@item{@racket['close-button] --- include a close button in the
dialog's title bar, which would not normally be included (Mac OS X)}
dialog's title bar, which would not normally be included (Mac OS)}
]

15
gui-doc/scribblings/gui/dialog-funcs.scrbl
View File

@ -45,7 +45,7 @@ Under Windows, if @racket[extension] is not @racket[#f], the returned path
The @racket[style] list can contain @racket['common], a
platform-independent version of the dialog is used instead of a
native dialog. On Mac OS X, if the @racket[style] list
native dialog. On Mac OS, if the @racket[style] list
contains @racket['packages], a user is allowed to select a package
directory, which is a directory with a special suffix (e.g.,
``.app'') that the Finder normally displays like a file. If the list
@ -62,7 +62,7 @@ On Windows and Unix, @racket[filters] determines a set of filters from
regular expressions and can only be used with a @litchar["*"] wildcard
character. For example, @racket["*.jp*g;*.png"].
On Unix, a @racket["*.*"] pattern is implicitly replaced with @racket["*"].
On Mac OS X, suffix names are extracted from all globs that match a
On Mac OS, suffix names are extracted from all globs that match a
fixed suffix (e.g., two suffixes of @racket["foo"] and @racket["bar"]
are extracted from a @racket["*.foo;*.bar;*.baz*"] pattern), and files
that have any of these suffixes in any filter are selectable; a
@ -133,7 +133,7 @@ On Windows, if @racket[extension] is not @racket[#f], the returned path
is @racket[(string-append "*." extension)], then the result pathname is guaranteed
to have an extension mapping @racket[extension].
On Mac OS X 10.5 and later, if @racket[extension] is not
On Mac OS 10.5 and later, if @racket[extension] is not
@racket[#f] or @racket[""], the returned path will get a default extension if the
user does not supply one. If @racket[filters] contains as
@racket["*.*"] pattern, then the user can supply any extension that
@ -145,7 +145,7 @@ On Mac OS X 10.5 and later, if @racket[extension] is not
"*." extension)], then the result pathname is guaranteed to have an
extension mapping @racket[extension].
On Mac OS X versions before 10.5, the returned path will get a
On Mac OS versions before 10.5, the returned path will get a
default extension only if @racket[extension] is not @racket[#f],
@racket[extension] is not @racket[""], and
@racket[filters] contains only @racket[(string-append "*."
@ -183,7 +183,7 @@ If @racket[directory] is not @racket[#f], it is used on some platforms as
The @racket[style] argument is treated as for
@racket[get-file], except that only @racket['common] or @racket['enter-packages] can be
specified. The latter
matters only on Mac OS X, where @racket['enter-packages]
matters only on Mac OS, where @racket['enter-packages]
enables the user to select package directory or a directory within a
package. A package is a directory with a special suffix (e.g.,
``.app'') that the Finder normally displays like a file.
@ -295,8 +295,7 @@ If @racket[style] does not include @racket['number-order], the order of
@item{Button 1 is the normal action, and it is usually the default
button. For example, if the dialog has an @onscreen{OK} button, it is
this one. On Windows, this button is leftmost; on Unix and Mac OS
X, it is rightmost. (See also
this one. On Windows, this button is leftmost; on Unix and Mac OS, it is rightmost. (See also
@racket[system-position-ok-before-cancel?].) Use this button for
dialogs that contain only one button.}
@ -305,7 +304,7 @@ If @racket[style] does not include @racket['number-order], the order of
when confirming a file replacement).}
@item{Button 3 tends to be separated from the other two (on
Mac OS X, it is left-aligned in the dialog). Use this button only
Mac OS, it is left-aligned in the dialog). Use this button only
for three-button dialogs.}
]

5
gui-doc/scribblings/gui/editor-funcs.scrbl
View File

@ -179,7 +179,7 @@ Gets the snip class list instance for the current eventspace.
[(map-command-as-meta-key)
boolean?])]{
Determines the interpretation of @litchar{m:} for a @racket[keymap%]
mapping on Mac OS X. See also
mapping on Mac OS. See also
@xmethod[keymap% map-function].
@ -187,8 +187,7 @@ First case:
If @racket[on?] is @racket[#t], @litchar{m:} corresponds to the Command key. If
@racket[on?] is @racket[#f], then @litchar{m:} corresponds to no key on Mac OS
X.
@racket[on?] is @racket[#f], then @litchar{m:} corresponds to no key on Mac OS.

2
gui-doc/scribblings/gui/editor-intf.scrbl
View File

@ -2064,7 +2064,7 @@ The filename and format used to save the file can be retrieved with
See also @method[editor<%> on-save-file], @method[editor<%>
after-save-file], and @method[editor<%> can-save-file?].
On Mac OS X, the file's type signature is set to @racket["TEXT"]
On Mac OS, the file's type signature is set to @racket["TEXT"]
for a text-format file or @racket["WXME"] for a standard-format
(binary) file.

2
gui-doc/scribblings/gui/editor-overview.scrbl
View File

@ -590,7 +590,7 @@ Text can be extracted from an editor in either of two forms:
mapped to themselves, but more complicated @techlink{item}s can be
represented with a useful string determined by the @techlink{item}'s
snip. Newlines are mapped to platform-specific character sequences
(linefeed on Unix and Mac OS X, and
(linefeed on Unix and Mac OS, and
linefeed--carriage return on Windows). This form is called
``flattened'' because the editor's @techlink{item}s have been reduced
to a linear sequence of characters.}

6
gui-doc/scribblings/gui/eventspace-funcs.scrbl
View File

@ -65,7 +65,7 @@ the eventspace @racket[e] itself.
@defproc[(check-for-break)
boolean?]{
Inspects the event queue of the current eventspace, searching for a
Shift-Ctl-C (Unix, Windows) or Cmd-. (Mac OS X) key combination. Returns
Shift-Ctl-C (Unix, Windows) or Cmd-. (Mac OS) key combination. Returns
@racket[#t] if such an event was found (and the event is dequeued) or
@racket[#f] otherwise.
@ -101,7 +101,7 @@ Returns the top level window in the current eventspace that is visible
boolean?])]{
For backward compatibility, only. This function was intended to enable
or disable special Control key handling (Mac OS X), but it currently
or disable special Control key handling (Mac OS), but it currently
has no effect.
}
@ -111,7 +111,7 @@ has no effect.
[(special-option-key)
boolean?])]{
Enables or disables special Option key handling (Mac OS X). When
Enables or disables special Option key handling (Mac OS). When
Option is treated as a special key, the @method[key-event%
get-key-code] and @method[key-event% get-other-altgr-key-code]
results are effectively swapped when the Option key is pressed. By

6
gui-doc/scribblings/gui/font-funcs.scrbl
View File

@ -7,7 +7,7 @@
This font is the default for @racket[popup-menu%] objects.
On Mac OS X, this font is slightly larger than
On Mac OS, this font is slightly larger than
@racket[normal-control-font]. On Windows and Unix, it is the same
size as @racket[normal-control-font].
@ -28,7 +28,7 @@ This font is the default for @racket[group-box-panel%] objects, and it is
On Windows, this font is the same size as
@racket[normal-control-font], since the Windows control font is
already relatively small. On Unix and Mac OS X, this font is slightly
already relatively small. On Unix and Mac OS, this font is slightly
smaller than @racket[normal-control-font].
@ -46,7 +46,7 @@ This font is for tiny controls, and it is smaller than
This font is the default for @racket[list-box%] objects (but not
list box labels, which use @racket[normal-control-font]).
On Mac OS X, this font is slightly smaller than
On Mac OS, this font is slightly smaller than
@racket[normal-control-font], and slightly larger than
@racket[small-control-font]. On Windows and Unix, it is the same size
as @racket[normal-control-font].

30
gui-doc/scribblings/gui/frame-class.scrbl
View File

@ -61,37 +61,37 @@ some platforms:
@item{@racket['no-resize-border] --- omits the resizeable border
around the window (Windows, Unix), ability to resize the window (Mac
OS X), or grow box in the bottom right corner (older Mac OS X)}
OS), or grow box in the bottom right corner (older Mac OS)}
@item{@racket['no-caption] --- omits the title bar for the frame
(Windows, Mac OS X, Unix)}
(Windows, Mac OS, Unix)}
@item{@racket['no-system-menu] --- omits the system menu
(Windows)}
@item{@racket['toolbar-button] --- includes a toolbar button on the
frame's title bar (Mac OS X 10.6 and earlier); a click on the toolbar button triggers
frame's title bar (Mac OS 10.6 and earlier); a click on the toolbar button triggers
a call to @method[frame% on-toolbar-button-click]}
@item{@racket['hide-menu-bar] --- hides the menu bar and dock when
the frame is active (Mac OS X) or asks the window manager to make
the frame is active (Mac OS) or asks the window manager to make
the frame fullscreen (Unix)}
@item{@racket['float] --- causes the frame to stay in front of all
other non-floating windows (Windows, Mac OS X, Unix); on Mac OS X, a floating frame
other non-floating windows (Windows, Mac OS, Unix); on Mac OS, a floating frame
shares the focus with an active non-floating frame; when this style
is combined with @racket['no-caption], then showing the frame does
not cause the keyboard focus to shift to the window, and on Unix,
clicking the frame does not move the focus; on Windows, a floating
frame has no taskbar button}
@item{@racket['metal] --- ignored (formerly supported for Mac OS X)}
@item{@racket['metal] --- ignored (formerly supported for Mac OS)}
@item{@racket['fullscreen-button] --- includes a button on the
frame's title bar to put the frame in fullscreen mode (Mac OS X 10.7 and later)}
frame's title bar to put the frame in fullscreen mode (Mac OS 10.7 and later)}
@item{@racket['fullscreen-aux] --- allows the frame to accompany
another that is in fullscreen mode (Mac OS X 10.7 and later)}
another that is in fullscreen mode (Mac OS 10.7 and later)}
]
@ -129,13 +129,13 @@ Puts the frame in fullscreen mode or restores the frame to
@Unmonitored[@elem{A frame's mode} @elem{the user} @elem{a
frame has been put in fullscreen mode} @elem{@method[frame% is-fullscreened?]}]
On Mac OS X, the @racket[frame%] must be created with the style
@racket['fullscreen-button] for fullscreen mode to work, and Mac OS X
On Mac OS, the @racket[frame%] must be created with the style
@racket['fullscreen-button] for fullscreen mode to work, and Mac OS
10.7 or later is required.
@history[#:added "1.9"
#:changed "1.18" @elem{Changed @method[frame% fullscreen] with @racket[#t]
to not imply @method[window<%> show] on Windows and Mac OS X.}]}
to not imply @method[window<%> show] on Windows and Mac OS.}]}
@defmethod[(get-menu-bar)
(or/c (is-a?/c menu-bar%) #f)]{
@ -184,7 +184,7 @@ otherwise.
@defmethod[(is-maximized?)
boolean?]{
On Windows and Mac OS X, returns @racket[#t] if the frame is
On Windows and Mac OS, returns @racket[#t] if the frame is
maximized, @racket[#f] otherwise. On Unix, the result is always
@racket[#f].
@ -194,7 +194,7 @@ maximized, @racket[#f] otherwise. On Unix, the result is always
void?]{
@methspec{
Maximizes or restores the frame on Windows and Mac OS X; the
Maximizes or restores the frame on Windows and Mac OS; the
frame's show state is not affected. On Windows, an iconized frame
cannot be maximized or restored.
@ -216,7 +216,7 @@ If @racket[maximize?] is @racket[#f], the window is restored, otherwise
void?])]{
Gets or sets the frame's modification state as reflected to the user.
On Mac OS X, the modification state is reflected as a dot in the
On Mac OS, the modification state is reflected as a dot in the
frame's close button. On Windows and Unix, the modification state is
reflected by an asterisk at the end of the frame's displayed title.
@ -261,7 +261,7 @@ Returns the result of
@defmethod[(on-toolbar-button-click)
void?]{
On Mac OS X, called when the user clicks the toolbar button on a
On Mac OS, called when the user clicks the toolbar button on a
frame created with the @indexed-racket['toolbar-button] style.
}

14
gui-doc/scribblings/gui/global-draw-funcs.scrbl
View File

@ -19,11 +19,11 @@ other actions depend on updating the display.}
Returns the number of pixels that correspond to one drawing unit on a
monitor. The result is normally @racket[1.0], but it is @racket[2.0]
on Mac OS X in Retina display mode, and on Windows or Unix it can be a value
on Mac OS in Retina display mode, and on Windows or Unix it can be a value
such as @racket[1.25], @racket[1.5], or @racket[2.0] when the operating-system
scale for text is changed. See also @secref["display-resolution"].
On Mac OS X or Unix, the result can change at any time. See also
On Mac OS or Unix, the result can change at any time. See also
@xmethod[top-level-window<%> display-changed].
If @racket[monitor] is not less than the current number of available
@ -36,7 +36,7 @@ If @racket[monitor] is not less than the current number of available
@defproc[(get-display-count) exact-positive-integer?]{
Returns the number of monitors currently active.
On Windows and Mac OS X, the result can change at any time.
On Windows and Mac OS, the result can change at any time.
See also @xmethod[top-level-window<%> display-changed].}
@ -59,7 +59,7 @@ Returns the depth of the main display (a value of 1 denotes a monochrome display
When the optional argument is @racket[#f] (the default), this function
returns the offset of @racket[monitor]'s origin from the
top-left of the physical monitor. For @racket[monitor] @racket[0], on Unix and Windows, the result is
always @racket[0] and @racket[0]; on Mac OS X, the result is
always @racket[0] and @racket[0]; on Mac OS, the result is
@racket[0] and the height of the menu bar. To position a frame
at a given @racket[monitor]'s top-left corner, use the negated results from
@racket[get-display-left-top-inset] as the frame's position.
@ -67,7 +67,7 @@ When the optional argument is @racket[#f] (the default), this function
When the optional @racket[avoid-bars?] argument is true, for @racket[monitor]
@racket[0], @racket[get-display-left-top-inset] function returns the
amount space at the left and top of the monitor that is occupied by
the task bar (Windows) or menu bar and dock (Mac OS X). On Unix, for
the task bar (Windows) or menu bar and dock (Mac OS). On Unix, for
monitor @racket[0], the result is always @racket[0] and @racket[0].
For monitors other than @racket[0], @racket[avoid-bars?] has no effect.
@ -89,10 +89,10 @@ See also @secref["display-resolution"].}
@index["screen resolution"]{Gets} the physical size of the specified @racket[monitor] in
pixels. On Windows, this size does not include the task bar by
default. On Mac OS X, this size does not include the menu bar or
default. On Mac OS, this size does not include the menu bar or
dock area by default.
On Windows and Mac OS X, if the optional argument is true and @racket[monitor] is @racket[0], then
On Windows and Mac OS, if the optional argument is true and @racket[monitor] is @racket[0], then
the task bar, menu bar, and dock area are included in the result.
If @racket[monitor] is not less than the current number of available

4
gui-doc/scribblings/gui/grow-box-spacer-pane-class.scrbl
View File

@ -5,10 +5,10 @@
A @racket[grow-box-spacer-pane%] object is intended for use as a
lightweight spacer in the bottom-right corner of a frame, rather than
as a container. On older version of Mac OS X, a
as a container. On older version of Mac OS, a
@racket[grow-box-spacer-pane%] has the same width and height as the
grow box that is inset into the bottom-right corner of a frame. On
Windows, Unix, and recent Mac OS X, a @racket[grow-box-spacer-pane%] has zero width and
Windows, Unix, and recent Mac OS, a @racket[grow-box-spacer-pane%] has zero width and
height. Unlike all other container types, a
@racket[grow-box-spacer-pane%] is unstretchable by default.

22
gui-doc/scribblings/gui/key-event-class.scrbl
View File

@ -46,7 +46,7 @@ get-key-release-code], is initialized to @racket['press].
@defmethod[(get-alt-down)
boolean?]{
Returns @racket[#t] if the Option (Mac OS X) key was down for
Returns @racket[#t] if the Option (Mac OS) key was down for
the event. When the Alt key is pressed in Windows, it is reported as
a Meta press (see
@method[key-event% get-meta-down]).
@ -63,7 +63,7 @@ Returns @racket[#t] if the Caps Lock key was on for the event.
boolean?]{
Returns @racket[#t] if the Control key was down for the event.
On Mac OS X, if a Control-key press is combined with a mouse button
On Mac OS, if a Control-key press is combined with a mouse button
click, the event is reported as a right-button click and
@method[key-event% get-control-down] for the event reports @racket[#f].
@ -177,7 +177,7 @@ The special key symbols attempt to capture useful keys that have no
@item{@racket[#\return] --- the Enter or Return key (on all
platforms), but not necessarily the Enter key near the numpad
(which is reported as @racket['numpad-enter] Unix and Mac OS X)}
(which is reported as @racket['numpad-enter] Unix and Mac OS)}
@item{@racket[#\tab] --- the tab key}
@ -198,7 +198,7 @@ A @racket['wheel-up], @racket['wheel-down], @racket['wheel-left], or
On Windows, when the Control key is pressed without Alt, the key
code for ASCII characters is downcased, roughly cancelling the effect
of the Shift key. On Mac OS X, the key code is computed without
of the Shift key. On Mac OS, the key code is computed without
Caps Lock effects when the Control or Command key is pressed; in the
case of Control, Caps Lock is used normally if special handling is
disabled for the Control key via @racket[special-control-key]. On
@ -225,8 +225,7 @@ Gets the virtual key code for a key-release event; the result is
@defmethod[(get-meta-down)
boolean?]{
Returns @racket[#t] if the Meta (Unix), Alt (Windows), or Command (Mac OS
X) key was down for the event.
Returns @racket[#t] if the Meta (Unix), Alt (Windows), or Command (Mac OS) key was down for the event.
}
@ -285,8 +284,7 @@ Since keyboard mappings vary, it is sometimes useful in key mappings
The @method[key-event% get-other-altgr-key-code] method provides the
same information with respect to the AltGr key (i.e., Alt combined
with Control) on Windows and Unix, or the Option key on Mac OS
X. The @method[key-event% get-other-shift-altgr-key-code] method
with Control) on Windows and Unix, or the Option key on Mac OS. The @method[key-event% get-other-shift-altgr-key-code] method
reports a mapping for in tha case that both Shift and AltGr/Option
were different from the actual event.
@ -303,7 +301,7 @@ keys would not normally produce further alternatives.)
Alternate mappings are not available for all events. On Windows,
alternate mappings are reported when they produce ASCII letters,
ASCII digits, and ASCII symbols. On Mac OS X and Unix, alternate
ASCII digits, and ASCII symbols. On Mac OS and Unix, alternate
mappings are usually available.
}
@ -334,7 +332,7 @@ Returns the y-position of the mouse at the time of the event in the
@defmethod[(set-alt-down [down? any/c])
void?]{
Sets whether the Option (Mac OS X) key was down for the event. When
Sets whether the Option (Mac OS) key was down for the event. When
the Alt key is pressed in Windows, it is reported as a Meta press
(see @method[key-event% set-meta-down]).
@ -352,7 +350,7 @@ Sets whether the Caps Lock key was on for the event.
Sets whether the Control key was down for the event.
On Mac OS X, if a control-key press is combined with a mouse button
On Mac OS, if a control-key press is combined with a mouse button
click, the event is reported as a right-button click and
@method[key-event% get-control-down] for the event reports
@racket[#f].
@ -388,7 +386,7 @@ Sets the virtual key code for a release event, either a character or
@defmethod[(set-meta-down [down? any/c])
void?]{
Sets whether the Meta (Unix), Alt (Windows), or Command (Mac OS X) key
Sets whether the Meta (Unix), Alt (Windows), or Command (Mac OS) key
was down for the event.
}

10
gui-doc/scribblings/gui/keymap-class.scrbl
View File

@ -181,12 +181,12 @@ The modifier identifiers are:
@item{@litchar{c:} --- All platforms: Control}
@item{@litchar{a:} --- Mac OS X: Option}
@item{@litchar{a:} --- Mac OS: Option}
@item{@litchar{m:} --- Windows: Alt; Unix: Meta; Mac OS X: Command, when
@item{@litchar{m:} --- Windows: Alt; Unix: Meta; Mac OS: Command, when
@racket[map-command-as-meta-key] produces @racket[#t]}
@item{@litchar{d:} --- Mac OS X: Command}
@item{@litchar{d:} --- Mac OS: Command}
@item{@litchar{l:} --- All platforms: Caps Lock}
@ -295,10 +295,10 @@ For a special keyword, the capitalization does not matter. However,
single-letter ASCII keynames are treated specially: @litchar{A} and
@litchar{s:a} are both treated as @litchar{s:A}. However, when
@litchar{c:} is included on Windows without @litchar{m:}, or when
@litchar{d:} is included on Mac OS X, then ASCII letters are not
@litchar{d:} is included on Mac OS, then ASCII letters are not
upcased with @litchar{s:}, since the upcasing behavior of the Shift key
is cancelled by Control without Alt (on Windows) or by Command
(on Mac OS X).
(on Mac OS).
A state can match multiple state strings mapped in a keymap (or keymap
chain); when a state matches multiple state strings, a mapping is

4
gui-doc/scribblings/gui/labelled-menu-item-intf.scrbl
View File

@ -106,9 +106,9 @@ If the label contains @litchar{&} and the window is a control, the
selected (via @method[frame% on-menu-char]). When a menu has the
focus, the mnemonic characters are used for navigation without Alt. A
@litchar{&&} in the label is replaced by a literal (non-navigation)
@litchar{&}. On Mac OS X, @litchar{&}s in the label are parsed in
@litchar{&}. On Mac OS, @litchar{&}s in the label are parsed in
the same way as for Unix and Windows, but no mnemonic underline is
displayed. On Mac OS X, a parenthesized mnemonic character is
displayed. On Mac OS, a parenthesized mnemonic character is
removed (along with any surrounding space) before the label is
displayed, since a parenthesized mnemonic is often used for non-Roman
languages. Finally, for historical reasons, if a label contains a tab character, then the

2
gui-doc/scribblings/gui/message-class.scrbl
View File

@ -29,7 +29,7 @@ Creates a string or bitmap message initially showing @racket[label].
@bitmaplabeluse[label] An @indexed-racket['app],
@indexed-racket['caution], or @indexed-racket['stop] symbol for
@racket[label] indicates an icon; @racket['app] is the application
icon (Windows and Mac OS X) or a generic ``info'' icon (X),
icon (Windows and Mac OS) or a generic ``info'' icon (X),
@racket['caution] is a caution-sign icon, and @racket['stop] is a
stop-sign icon.

14
gui-doc/scribblings/gui/miscwin-funcs.scrbl
View File

@ -56,7 +56,7 @@ See @racket[begin-busy-cursor].
(lambda (s) (and (bytes? s)
(= 4 (bytes-length s)))))])]{
Gets or sets the creator and type of a file in Mac OS X.
Gets or sets the creator and type of a file in Mac OS.
The get operation always returns @racket[#"????"] and @racket[#"????"] for
Unix or Windows. The set operation has no effect on Unix or
@ -105,7 +105,7 @@ Returns an immutable list specifying the default prefix for menu
shortcuts. See also
@xmethod[selectable-menu-item<%> get-shortcut-prefix].
On Windows, the default is @racket['(ctl)]. On Mac OS X, the
On Windows, the default is @racket['(ctl)]. On Mac OS, the
default is @racket['(cmd)]. On Unix, the default is normally
@racket['(ctl)], but the default can be changed through the
@Resource{defaultMenuPrefix} low-level preference (see
@ -197,7 +197,7 @@ follows:
@item{@racket['win32] (Windows)}
@item{@racket['cocoa] (Mac OS X)}
@item{@racket['cocoa] (Mac OS)}
@item{@racket['gtk2] --- GTK+ version 2}
@ -232,7 +232,7 @@ break is sent (via @racket[break-thread]) to the created eventspace's
(listof (or/c 'left 'middle 'right
'shift 'control 'alt 'meta 'caps)))]{
@margin-note{On Mac OS X 10.5 and earlier, mouse-button information is
@margin-note{On Mac OS 10.5 and earlier, mouse-button information is
not available, so the second result includes only symbols for modifier
keys.}
@ -303,7 +303,7 @@ environment of the result namespace.}
Creates a bitmap that draws in a way that is the same as drawing to a
canvas in its default configuration.
In particular, on Mac OS X when the main monitor is in Retina display
In particular, on Mac OS when the main monitor is in Retina display
mode, a drawing unit corresponds to two pixels, and the bitmap
internally contains four times as many pixels as requested by
@racket[width] and @racket[height]. On Windows, the backing scale
@ -325,7 +325,7 @@ Plays a sound file. If @racket[async?] is false, the function does not
On Windows, MCI is used to play sounds, so file formats such as
@filepath{.wav} and @filepath{.mp3} should be supported.
On Mac OS X, Quicktime is used to play sounds; most sound
On Mac OS, Quicktime is used to play sounds; most sound
formats (@filepath{.wav}, @filepath{.aiff}, @filepath{.mp3}) are supported in recent versions of
Quicktime. To play @filepath{.wav} files, Quicktime 3.0 (compatible
with OS 7.5 and up) is required.
@ -426,7 +426,7 @@ Equivalent to @racket[(integer-in 0 1000)].}
Returns @racket[#t] on Windows---indicating that a dialog with
@onscreen{OK} and @onscreen{Cancel} buttons should place the
@onscreen{OK} button on to left of the @onscreen{Cancel} button---and
returns @racket[#f] on Mac OS X and Unix.}
returns @racket[#f] on Mac OS and Unix.}
@defthing[the-clipboard (is-a?/c clipboard<%>)]{

25
gui-doc/scribblings/gui/mouse-event-class.scrbl
View File

@ -41,8 +41,8 @@ Creates a mouse event for a particular type of event. The event types
@item{@racket['left-up] --- left mouse button released}
@item{@racket['middle-down] --- middle mouse button pressed}
@item{@racket['middle-up] --- middle mouse button released}
@item{@racket['right-down] --- right mouse button pressed (Mac OS X: click with control key pressed)}
@item{@racket['right-up] --- right mouse button released (Mac OS X: release with control key pressed)}
@item{@racket['right-down] --- right mouse button pressed (Mac OS: click with control key pressed)}
@item{@racket['right-up] --- right mouse button released (Mac OS: release with control key pressed)}
@item{@racket['motion] --- mouse moved, with or without button(s) pressed}
]
@ -121,7 +121,7 @@ When the mouse button is up, an enter/leave event notifies a window
@defmethod[(get-alt-down)
boolean?]{
Returns @racket[#t] if the Option (Mac OS X) key was down for the
Returns @racket[#t] if the Option (Mac OS) key was down for the
event. When the Alt key is pressed in Windows, it is reported as a
Meta press (see @method[mouse-event% get-meta-down]).
@ -139,7 +139,7 @@ Returns @racket[#t] if the Caps Lock key was on for the event.
Returns @racket[#t] if the Control key was down for the event.
On Mac OS X, if a control-key press is combined with a mouse button
On Mac OS, if a control-key press is combined with a mouse button
click, the event is reported as a right-button click and
@method[mouse-event% get-control-down] for the event reports
@racket[#f].
@ -166,8 +166,7 @@ Returns @racket[#t] if the left mouse button was down (but not pressed) during t
@defmethod[(get-meta-down)
boolean?]{
Returns @racket[#t] if the Meta (Unix), Alt (Windows), or Command (Mac OS
X) key was down for the event.
Returns @racket[#t] if the Meta (Unix), Alt (Windows), or Command (Mac OS) key was down for the event.
}
@ -175,7 +174,7 @@ Returns @racket[#t] if the Meta (Unix), Alt (Windows), or Command (Mac OS
boolean?]{
Returns @racket[#t] if the middle mouse button was down (but not
pressed) for the event. On Mac OS X, a middle-button click is
pressed) for the event. On Mac OS, a middle-button click is
impossible.
}
@ -205,7 +204,7 @@ Returns @racket[#t] if the Mod5 (Unix) key was down for the event.
boolean?]{
Returns @racket[#t] if the right mouse button was down (but not
pressed) for the event. On Mac OS X, a control-click combination
pressed) for the event. On Mac OS, a control-click combination
is treated as a right-button click.
}
@ -255,7 +254,7 @@ Returns @racket[#t] if this was a moving event (whether a button is
@defmethod[(set-alt-down [down? any/c])
void?]{
Sets whether the Option (Mac OS X) key was down for the event. When
Sets whether the Option (Mac OS) key was down for the event. When
the Alt key is pressed in Windows, it is reported as a Meta press
(see @method[mouse-event% set-meta-down]).
@ -273,7 +272,7 @@ Sets whether the Caps Lock key was on for the event.
Sets whether the Control key was down for the event.
On Mac OS X, if a control-key press is combined with a mouse button
On Mac OS, if a control-key press is combined with a mouse button
click, the event is reported as a right-button click and
@method[mouse-event% get-control-down] for the event reports
@racket[#f].
@ -301,7 +300,7 @@ the event.
@defmethod[(set-meta-down [down? any/c])
void?]{
Sets whether the Meta (Unix), Alt (Windows), or Command (Mac OS X) key
Sets whether the Meta (Unix), Alt (Windows), or Command (Mac OS) key
was down for the event.
}
@ -310,7 +309,7 @@ Sets whether the Meta (Unix), Alt (Windows), or Command (Mac OS X) key
void?]{
Sets whether the middle mouse button was down (but not pressed) for
the event. On Mac OS X, a middle-button click is impossible.
the event. On Mac OS, a middle-button click is impossible.
}
@ -339,7 +338,7 @@ Sets whether the Mod5 (Unix) key was down for the event.
void?]{
Sets whether the right mouse button was down (but not pressed) for the
event. On Mac OS X, a control-click combination by the user is
event. On Mac OS, a control-click combination by the user is
treated as a right-button click.
}

2
gui-doc/scribblings/gui/pasteboard-class.scrbl
View File

@ -553,7 +553,7 @@ Pastes.
@methspec{
Called to paste the current contents of the X11 selection on Unix (or
the clipboard on Windows and Mac OS X) into the editor. This
the clipboard on Windows and Mac OS) into the editor. This
method is provided so that it can be overridden by subclasses. Do
not call this method directly; instead, call @method[editor<%>
paste-x-selection].

4
gui-doc/scribblings/gui/selectable-menu-item-intf.scrbl
View File

@ -55,11 +55,11 @@ Returns a list of symbols that indicates the keyboard prefix used for the menu
@itemize[
@item{@racket['alt] --- Meta (Windows and X only)}
@item{@racket['cmd] --- Command (Mac OS X only)}
@item{@racket['cmd] --- Command (Mac OS only)}
@item{@racket['meta] --- Meta (Unix only)}
@item{@racket['ctl] --- Control}
@item{@racket['shift] --- Shift}
@item{@racket['option] --- Option (Mac OS X only)}
@item{@racket['option] --- Option (Mac OS only)}
]
On Unix, at most one of @racket['alt] and @racket['meta] can be

19
gui-doc/scribblings/gui/system-menu-funcs.scrbl
View File

@ -6,14 +6,14 @@
@defproc[(current-eventspace-has-standard-menus?)
boolean?]{
Returns @racket[#t] for Mac OS X when the current eventspace is the
Returns @racket[#t] for Mac OS when the current eventspace is the
initial one, since that eventspace is the target for the standard
application menus. For any other system or eventspace, the result is
@racket[#f].
This procedure is intended for use in deciding whether to include a
@onscreen{Quit}, @onscreen{About}, and @onscreen{Preferences} menu
item in a frame's menu. On Mac OS X, the application
item in a frame's menu. On Mac OS, the application
@onscreen{Quit} menu triggers a call to a frame's
@method[top-level-window<%> on-exit] method, the @onscreen{About} menu item is controlled by
@racket[application-about-handler], and the
@ -24,7 +24,7 @@ This procedure is intended for use in deciding whether to include a
@defproc[(current-eventspace-has-menu-root?)
boolean?]{
Returns @racket[#t] for Mac OS X when the current eventspace is the
Returns @racket[#t] for Mac OS when the current eventspace is the
initial one, since that eventspace can supply a menu bar to be active
when no frame is visible. For any other system or eventspace, the
result is @racket[#f].
@ -41,8 +41,7 @@ This procedure is intended for use in deciding whether to create a
When the current eventspace is the initial eventspace, this
procedure retrieves or installs a thunk that is called when the
user selects the application @onscreen{About} menu item on Mac OS
X. The thunk is always called in the initial eventspace's
user selects the application @onscreen{About} menu item on Mac OS. The thunk is always called in the initial eventspace's
handler thread (as a callback).
The default handler displays a generic Racket dialog.
@ -59,7 +58,7 @@ or has no effect (when called with a handler).
[(application-file-handler [handler-proc (path? . -> . any)])
void?])]{
When the current eventspace is the initial eventspace, this procedure
retrieves or installs a procedure that is called on Mac OS X
retrieves or installs a procedure that is called on Mac OS
and Windows when the application is running and user double-clicks an
application-handled file or drags a file onto the application's
icon. The procedure is always called in the initial eventspace's
@ -77,7 +76,7 @@ On Windows, when the application is @italic{not} running and user double-clicks
the filename is provided as a command-line argument to the
application.
On Mac OS X, if an application is started @emph{without} files, then
On Mac OS, if an application is started @emph{without} files, then
the @racket[application-start-empty-handler] procedure is called.
If the current eventspace is not the initial eventspace, this
@ -92,7 +91,7 @@ or has no effect (when called with a handler).
void?])]{
When the current eventspace is the initial eventspace, this procedure
retrieves or installs a thunk that is called when the user selects
the application @onscreen{Preferences} menu item on Mac OS X. The
the application @onscreen{Preferences} menu item on Mac OS. The
thunk is always called in the initial eventspace's handler thread (as
a callback). If the handler is set to @racket[#f], the
@onscreen{Preferences} item is disabled.
@ -111,7 +110,7 @@ or has no effect (when called with a handler).
When the current eventspace is the initial eventspace, this procedure
retrieves or installs a thunk that is called when the user requests
that the application quit (e.g., through the @onscreen{Quit} menu
item on Mac OS X, or when shutting down the machine in Windows). The
item on Mac OS, or when shutting down the machine in Windows). The
thunk is always called in the initial eventspace's handler thread (as
a callback). If the result of the thunk is @racket[#f], then the
operating system is explicitly notified that the application does not
@ -139,7 +138,7 @@ or has no effect (when called with a handler).
void?])]{
When the current eventspace is the initial eventspace, this procedure
retrieves or installs a thunk that is called when the user starts
the application on Mac OS X without supplying any initial files (e.g.,
the application on Mac OS without supplying any initial files (e.g.,
by double-clicking the application icon instead of double-clicking
files that are handled by the application).

2
gui-doc/scribblings/gui/text-class.scrbl
View File

@ -479,7 +479,7 @@ Pastes into the @techlink{position} @racket[start].
@methspec{
Called to paste the current contents of the X11 selection on Unix (or the
clipboard on Windows or Mac OS X) into the editor. This method is
clipboard on Windows or Mac OS) into the editor. This method is
provided so that it can be overridden by subclasses. Do not call
this method directly; instead, call @method[text% paste-x-selection].

8
gui-doc/scribblings/gui/top-level-window-intf.scrbl
View File

@ -125,7 +125,7 @@ Called when a window is @defterm{activated} or
@defterm{deactivated}. A top-level window is activated when the
keyboard focus moves from outside the window to the window or one of
its children. It is deactivated when the focus moves back out of the
window. On Mac OS X, a child of a floating frames can have the
window. On Mac OS, a child of a floating frames can have the
focus instead of a child of the active non-floating frame; in other
words, floating frames act as an extension of the active non-frame
for keyboard focus.
@ -156,7 +156,7 @@ Called by the default application quit handler (as determined by the
@racket[application-quit-handler] parameter) when the operating
system requests that the application shut down (e.g., when the
@onscreen{Quit} menu item is selected in the main application menu
on Mac OS X). In that case, this method is called for the most
on Mac OS). In that case, this method is called for the most
recently active top-level window in the initial eventspace, but only
if the window's @method[top-level-window<%> can-exit?] method first
returns true.
@ -249,7 +249,7 @@ If the window that currently owns the focus specifically handles the
@item{@racket[text-field%], @racket['single] style --- arrow key
events and alphanumeric key events when the Meta (Unix) or Alt
(Windows) key is not pressed (and all alphanumeric events on
Mac OS X)}
Mac OS)}
@item{@racket[text-field%], @racket['multiple] style --- all
keyboard events, except alphanumeric key events when the Meta (Unix) or
@ -348,7 +348,7 @@ The icon is used in a platform-specific way:
top-left) and in the task bar, and the large icon is used for
the Alt-Tab task switcher.}
@item{Mac OS X --- both icons are ignored.}
@item{Mac OS --- both icons are ignored.}
@item{Unix --- many window managers use the small icon in the same way
as Windows, and others use the small icon when iconifying the

2
gui-doc/scribblings/gui/win-overview.scrbl
View File

@ -1006,7 +1006,7 @@ sequence.
@section[#:tag "display-resolution"]{Screen Resolution and Text Scaling}
On Mac OS X, screen sizes are described to users in terms of drawing
On Mac OS, screen sizes are described to users in terms of drawing
units. A Retina display provides two pixels per drawing unit, while
drawing units are used consistently for window sizes, child window
positions, and canvas drawing. A ``point'' for font sizing is

8
gui-doc/scribblings/gui/window-intf.scrbl
View File

@ -37,7 +37,7 @@ All @racket[window<%>] classes accept the following named instantiation
@index["global coordinates"]{Converts} local window coordinates to
screen coordinates.
On Mac OS X, the screen coordinates start with @math{(0, 0)} at the
On Mac OS, the screen coordinates start with @math{(0, 0)} at the
upper left of the menu bar. In contrast, @xmethod[top-level-window<%>
move] considers @math{(0, 0)} to be below the menu bar. See also
@racket[get-display-left-top-inset].
@ -93,7 +93,7 @@ on the platform:
@item{Windows: @tt{HWND}}
@item{Mac OS X: @tt{NSView}}
@item{Mac OS: @tt{NSView}}
@item{Unix: @tt{GtkWidget}}
@ -139,7 +139,7 @@ platform:
@item{Windows: @tt{HWND}}
@item{Mac OS X: @tt{NSWindow} for a @racket[top-level-window<%>] object,
@item{Mac OS: @tt{NSWindow} for a @racket[top-level-window<%>] object,
@tt{NSView} for other windows}
@item{Unix: @tt{GtkWidget}}
@ -312,7 +312,7 @@ Indicates whether the window is currently shown or not. The result is
protocol.) Drag-and-drop must first be enabled for the window with
@method[window<%> accept-drop-files].
On Mac OS X, when the application is running and user
On Mac OS, when the application is running and user
double-clicks an application-handled file or drags a file onto the
application's icon, the main thread's application file handler is
called (see

2
gui-lib/framework/gui-utils.rkt
View File

@ -383,7 +383,7 @@
(cancel-label (string-constant cancel))
(confirm-style '(border))))
@{Adds an Ok and a cancel button to a panel, changing the order
to suit the platform. Under Mac OS X and unix, the confirmation action
to suit the platform. Under Mac OS and unix, the confirmation action
is on the right (or bottom) and under Windows, the canceling action is on
the right (or bottom).
The buttons are also sized to be the same width.

2
gui-lib/framework/test.rkt
View File

@ -1024,7 +1024,7 @@
@method[canvas<%> on-event] method.
Use @racket[test:button-push] to click on a button.
Under Mac OS X, @racket['right] corresponds to holding down the command
Under Mac OS, @racket['right] corresponds to holding down the command
modifier key while clicking and @racket['middle] cannot be generated.
Under Windows, @racket['middle] can only be generated if the user has a

4
gui-lib/mred/private/wx/cocoa/key-translate.rkt
View File

@ -400,9 +400,9 @@
(define-unicode-key kOptionUnicode #x2325) ;/* Unicode OPTION KEY*/
(define-unicode-key kCommandUnicode #x2318) ;/* Unicode PLACE OF INTEREST SIGN*/
(define-unicode-key kPencilUnicode #x270E) ;/* Unicode LOWER RIGHT PENCIL;
; actually pointed left until Mac OS X 10.3*/
; actually pointed left until Mac OS 10.3*/
(define-unicode-key kPencilLeftUnicode #xF802) ;/* Unicode LOWER LEFT PENCIL;
; available in Mac OS X 10.3 and later*/
; available in Mac OS 10.3 and later*/
(define-unicode-key kCheckUnicode #x2713) ;/* Unicode CHECK MARK*/
(define-unicode-key kDiamondUnicode #x25C6) ;/* Unicode BLACK DIAMOND*/
(define-unicode-key kBulletUnicode #x2022) ;/* Unicode BULLET*/

2
gui-lib/mred/private/wxtop.rkt
View File

@ -407,7 +407,7 @@
[center (lambda (dir)
(when pending-redraws? (force-redraw))
(set! use-default-position? #f)
(super center dir parent-for-center))] ; 2nd argument is for Mac OS X
(super center dir parent-for-center))] ; 2nd argument is for Mac OS
;; on-size: ensures that size of frame matches size of content
;; input: new-width/new-height: new size of frame

2
gui-test/tests/gracket/item.rkt
View File

@ -2214,7 +2214,7 @@
(make-object button% "Toggle" f (lambda (b e)
(send f on-toolbar-button-click)))
(make-object message% "Mac OS X: toolbar button also toggles" f)
(make-object message% "Mac OS: toolbar button also toggles" f)
(send f show #t))
;----------------------------------------------------------------------