Drop Mac prefix on remaining instances of OS X in docs.
This should have been part of df33c0c491
but somehow where missed.
This commit is contained in:
@@ -115,7 +115,7 @@ public:
|
||||
@ref page_stockitems "this list", a standard label will be used. In
|
||||
other words, if you use a predefined @c wxID_XXX constant, just omit
|
||||
the label completely rather than specifying it. In particular, help
|
||||
buttons (the ones with @a id of @c wxID_HELP) under Mac OS X can't
|
||||
buttons (the ones with @a id of @c wxID_HELP) under OS X can't
|
||||
display any label at all and while wxButton will detect if the standard
|
||||
"Help" label is used and ignore it, using any other label will prevent
|
||||
the button from correctly appearing as a help button and so should be
|
||||
|
@@ -182,7 +182,7 @@ public:
|
||||
so that this button is only added to a dialog for non-Windows platforms
|
||||
(use wxDIALOG_EX_CONTEXTHELP on Windows).
|
||||
|
||||
Note that on Mac OS X, the cursor does not change when in context-sensitive
|
||||
Note that on OS X, the cursor does not change when in context-sensitive
|
||||
help mode.
|
||||
|
||||
@library{wxcore}
|
||||
|
@@ -1332,7 +1332,7 @@ public:
|
||||
style as in the case of single selection it returns the same thing as
|
||||
GetSelection().
|
||||
|
||||
Notice that under all platforms except Mac OS X the currently focused
|
||||
Notice that under all platforms except OS X the currently focused
|
||||
item may be selected or not but under OS X the current item is always
|
||||
selected.
|
||||
|
||||
|
@@ -155,7 +155,7 @@ struct wxFontMetrics
|
||||
In general wxDC methods don't support alpha transparency and the alpha
|
||||
component of wxColour is simply ignored and you need to use wxGraphicsContext
|
||||
for full transparency support. There are, however, a few exceptions: first,
|
||||
under Mac OS X colours with alpha channel are supported in all the normal
|
||||
under OS X colours with alpha channel are supported in all the normal
|
||||
wxDC-derived classes as they use wxGraphicsContext internally. Second,
|
||||
under all platforms wxSVGFileDC also fully supports alpha channel. In both
|
||||
of these cases the instances of wxPen or wxBrush that are built from
|
||||
|
@@ -911,13 +911,13 @@ enum wxKeyCode
|
||||
WXK_CLEAR,
|
||||
WXK_SHIFT,
|
||||
WXK_ALT,
|
||||
/** Note that under Mac OS X, to improve compatibility with other
|
||||
/** Note that under OS X, to improve compatibility with other
|
||||
* systems, 'WXK_CONTROL' represents the 'Command' key. Use this
|
||||
* constant to work with keyboard shortcuts. See 'WXK_RAW_CONTROL'
|
||||
* to get the state of the actual 'Control' key.
|
||||
*/
|
||||
WXK_CONTROL,
|
||||
/** Under Mac OS X, where the 'Command' key is mapped to 'Control'
|
||||
/** Under OS X, where the 'Command' key is mapped to 'Control'
|
||||
* to improve compatibility with other systems, WXK_RAW_CONTROL may
|
||||
* be used to obtain the state of the actual 'Control' key
|
||||
* ('WXK_CONTROL' would obtain the status of the 'Command' key).
|
||||
@@ -1015,7 +1015,7 @@ enum wxKeyCode
|
||||
WXK_WINDOWS_RIGHT,
|
||||
WXK_WINDOWS_MENU ,
|
||||
|
||||
/** This special key code was used to represent the key used for keyboard shortcuts. Under Mac OS X,
|
||||
/** This special key code was used to represent the key used for keyboard shortcuts. Under OS X,
|
||||
* this key maps to the 'Command' (aka logo or 'Apple') key, whereas on Linux/Windows/others
|
||||
* this is the Control key, with the new semantic of WXK_CONTROL, WXK_COMMAND is not needed anymore
|
||||
*/
|
||||
|
@@ -126,7 +126,7 @@ enum wxDialogLayoutAdaptationMode
|
||||
calling SetExtraStyle() before Create is called (two-step
|
||||
construction).
|
||||
@style{wxDIALOG_EX_METAL}
|
||||
On Mac OS X, frames with this style will be shown with a metallic
|
||||
On OS X, frames with this style will be shown with a metallic
|
||||
look. This is an extra style.
|
||||
@endStyleTable
|
||||
|
||||
|
@@ -119,7 +119,7 @@
|
||||
frames having this style (the dialogs don't have a minimize or a
|
||||
maximize box by default)
|
||||
@style{wxFRAME_EX_METAL}
|
||||
On Mac OS X, frames with this style will be shown with a metallic
|
||||
On OS X, frames with this style will be shown with a metallic
|
||||
look. This is an extra style.
|
||||
@endExtraStyleTable
|
||||
|
||||
|
@@ -205,7 +205,7 @@ enum
|
||||
be set up and their meanings will be described below.
|
||||
|
||||
@note
|
||||
On those platforms which use a configure script (e.g. Linux and Mac OS)
|
||||
On those platforms which use a configure script (e.g. Linux and OS X)
|
||||
OpenGL support is automatically enabled if the relative headers and
|
||||
libraries are found.
|
||||
To switch it on under the other platforms (e.g. Windows), you need to edit
|
||||
|
@@ -580,7 +580,7 @@ public:
|
||||
Returns @NULL if no label is being edited.
|
||||
|
||||
@note It is currently only implemented for wxMSW and the generic version,
|
||||
not for the native Mac OS X version.
|
||||
not for the native OS X version.
|
||||
*/
|
||||
wxTextCtrl* GetEditControl() const;
|
||||
|
||||
|
@@ -416,7 +416,7 @@ public:
|
||||
"ALT" and @c "SHIFT" strings (case doesn't matter) separated by either
|
||||
@c '-' or @c '+' characters and followed by the accelerator itself.
|
||||
Notice that @c CTRL corresponds to the "Ctrl" key on most platforms but
|
||||
not under Mac OS where it is mapped to "Cmd" key on Mac keyboard.
|
||||
not under OS X where it is mapped to "Cmd" key on Mac keyboard.
|
||||
Usually this is exactly what you want in portable code but if you
|
||||
really need to use the (rarely used for this purpose) "Ctrl" key even
|
||||
under Mac, you may use @c RAWCTRL to prevent this mapping. Under the
|
||||
|
@@ -23,7 +23,7 @@ enum wxOperatingSystemId
|
||||
wxOS_UNKNOWN = 0, //!< returned on error
|
||||
|
||||
wxOS_MAC_OS = 1 << 0, //!< Apple Mac OS 8/9/X with Mac paths
|
||||
wxOS_MAC_OSX_DARWIN = 1 << 1, //!< Apple Mac OS X with Unix paths
|
||||
wxOS_MAC_OSX_DARWIN = 1 << 1, //!< Apple OS X with Unix paths
|
||||
|
||||
//! A combination of all @c wxOS_MAC_* values previously listed.
|
||||
wxOS_MAC = wxOS_MAC_OS|wxOS_MAC_OSX_DARWIN,
|
||||
|
@@ -805,7 +805,7 @@ public:
|
||||
page rectangle, or page margins rectangle to perform your own scaling.
|
||||
|
||||
@note
|
||||
While the underlying drawing model of Mac OS X is floating-point,
|
||||
While the underlying drawing model of OS X is floating-point,
|
||||
wxWidgets's drawing model scales from integer coordinates.
|
||||
*/
|
||||
void MapScreenSizeToDevice();
|
||||
|
@@ -49,7 +49,7 @@ enum wxPropertySheetDialogFlags
|
||||
|
||||
/**
|
||||
Shrinks the dialog window to fit the currently selected page
|
||||
(common behaviour for property sheets on Mac OS X).
|
||||
(common behaviour for property sheets on OS X).
|
||||
*/
|
||||
wxPROPSHEET_SHRINKTOFIT = 0x0100,
|
||||
};
|
||||
|
@@ -958,7 +958,7 @@ public:
|
||||
and ordering defined by the platform or toolkit's user interface guidelines
|
||||
(if such things exist). By using this class, you can ensure that all your
|
||||
standard dialogs look correct on all major platforms. Currently it conforms to
|
||||
the Windows, GTK+ and Mac OS X human interface guidelines.
|
||||
the Windows, GTK+ and OS X human interface guidelines.
|
||||
|
||||
When there aren't interface guidelines defined for a particular platform or
|
||||
toolkit, wxStdDialogButtonSizer reverts to the Windows implementation.
|
||||
@@ -969,9 +969,9 @@ public:
|
||||
and then call Realize in order to create the actual button layout used.
|
||||
Other than these special operations, this sizer works like any other sizer.
|
||||
|
||||
If you add a button with wxID_SAVE, on Mac OS X the button will be renamed to
|
||||
If you add a button with wxID_SAVE, on OS X the button will be renamed to
|
||||
"Save" and the wxID_NO button will be renamed to "Don't Save" in accordance
|
||||
with the Mac OS X Human Interface Guidelines.
|
||||
with the OS X Human Interface Guidelines.
|
||||
|
||||
@library{wxcore}
|
||||
@category{winlayout}
|
||||
|
@@ -658,7 +658,7 @@ enum wxSocketEventFlags
|
||||
This option can have surprising platform dependent behaviour, so check the
|
||||
documentation for your platform's implementation of setsockopt().
|
||||
|
||||
Note that on BSD-based systems(e.g. Mac OS X), use of
|
||||
Note that on BSD-based systems(e.g. OS X), use of
|
||||
@b wxSOCKET_REUSEADDR implies @b SO_REUSEPORT in addition to
|
||||
@b SO_REUSEADDR to be consistent with Windows.
|
||||
|
||||
|
@@ -19,7 +19,7 @@
|
||||
methods.
|
||||
|
||||
In the description of the methods below, the example return values are given
|
||||
for the Unix, Windows and Mac OS X systems, however please note that these are
|
||||
for the Unix, Windows and OS X systems, however please note that these are
|
||||
just the examples and the actual values may differ. For example, under Windows:
|
||||
the system administrator may change the standard directories locations, e.g.
|
||||
the Windows directory may be named @c "W:\Win2003" instead of
|
||||
@@ -240,7 +240,7 @@ public:
|
||||
specified category for the given language.
|
||||
|
||||
In general this is just the same as @a lang subdirectory of GetResourcesDir()
|
||||
(or @c lang.lproj under Mac OS X) but is something quite different for
|
||||
(or @c lang.lproj under OS X) but is something quite different for
|
||||
message catalog category under Unix where it returns the standard
|
||||
@c prefix/share/locale/lang/LC_MESSAGES directory.
|
||||
|
||||
@@ -267,7 +267,7 @@ public:
|
||||
The resources are the auxiliary data files needed for the application to run
|
||||
and include, for example, image and sound files it might use.
|
||||
|
||||
This function is the same as GetDataDir() for all platforms except Mac OS X.
|
||||
This function is the same as GetDataDir() for all platforms except OS X.
|
||||
Example return values:
|
||||
- Unix: @c prefix/share/appinfo
|
||||
- Windows: the directory where the executable file is located
|
||||
|
@@ -144,7 +144,7 @@ public:
|
||||
Returns true if system tray is available in the desktop environment the
|
||||
app runs under.
|
||||
|
||||
On Windows and Mac OS X, the tray is always available and this function
|
||||
On Windows and OS X, the tray is always available and this function
|
||||
simply returns true.
|
||||
|
||||
On Unix, X11 environment may or may not provide the tray, depending on
|
||||
|
@@ -144,7 +144,7 @@ public:
|
||||
|
||||
@e typeDefault is the value defined during the compilation and corresponds
|
||||
to the native format of the platform, i.e. it will be @c wxTextFileType_Dos
|
||||
under Windows and @c wxTextFileType_Unix under Unix (including Mac OS
|
||||
under Windows and @c wxTextFileType_Unix under Unix (including OS
|
||||
X, the value @c wxTextFileType_Mac was only used for classic Mac OS
|
||||
versions).
|
||||
*/
|
||||
|
@@ -25,7 +25,7 @@ wxEventType wxEVT_TOOLBOOK_PAGE_CHANGING;
|
||||
|
||||
@beginStyleTable
|
||||
@style{wxTBK_BUTTONBAR}
|
||||
Use wxButtonToolBar-based implementation under Mac OS (ignored under
|
||||
Use wxButtonToolBar-based implementation under OS X (ignored under
|
||||
other platforms).
|
||||
@style{wxTBK_HORZ_LAYOUT}
|
||||
Shows the text and the icons alongside, not vertically stacked (only
|
||||
|
@@ -849,9 +849,9 @@ wxString wxGetOsDescription();
|
||||
contain the kernel major and minor version numbers (as returned by the
|
||||
'uname -r' command); e.g. "4" and "1" if the machine is using kernel 4.1.4.
|
||||
|
||||
For Mac OS X systems (@c wxOS_MAC) the major and minor version integers are the
|
||||
For OS X systems (@c wxOS_MAC) the major and minor version integers are the
|
||||
natural version numbers associated with the OS; e.g. "10" and "11" if the machine
|
||||
is using Mac OS X El Capitan.
|
||||
is using OS X El Capitan.
|
||||
|
||||
For Windows-like systems (@c wxOS_WINDOWS) the major and minor version integers will
|
||||
contain the following values:
|
||||
|
@@ -30,7 +30,7 @@
|
||||
|
||||
This class is fully implemented only under the platforms where xlocale POSIX
|
||||
API or equivalent is available. Currently the xlocale API is available under
|
||||
most of the recent Unix systems (including Linux, various BSD and Mac OS X) and
|
||||
most of the recent Unix systems (including Linux, various BSD and OS X) and
|
||||
Microsoft Visual C++ standard library provides a similar API starting from
|
||||
version 8 (Visual Studio 2005).
|
||||
|
||||
|
Reference in New Issue
Block a user