Merge branch 'master' into osx-10_10-min-10_11-SDK

This commit is contained in:
Stefan Csomor
2020-07-04 23:03:55 +02:00
committed by GitHub
80 changed files with 190 additions and 190 deletions

View File

@@ -594,7 +594,7 @@ public:
virtual bool ShouldPreventAppExit() const;
/**
This function sets the wxTopLevelWindow's modified state on OS X,
This function sets the wxTopLevelWindow's modified state on macOS,
which currently draws a black dot in the wxTopLevelWindow's close button.
On other platforms, this method does nothing.
@@ -603,7 +603,7 @@ public:
virtual void OSXSetModified(bool modified);
/**
Returns the current modified state of the wxTopLevelWindow on OS X.
Returns the current modified state of the wxTopLevelWindow on macOS.
On other platforms, this method does nothing.
@see OSXSetModified()
@@ -613,7 +613,7 @@ public:
/**
Sets the file name represented by this wxTopLevelWindow.
Under OS X, this file name is used to set the "proxy icon", which
Under macOS, this file name is used to set the "proxy icon", which
appears in the window title bar near its title, corresponding to this
file name. Under other platforms it currently doesn't do anything but
it is harmless to call it now and it might be implemented to do
@@ -633,7 +633,7 @@ public:
/**
Enables the maximize button to toggle full screen mode. Prior to
OS X 10.10 a full screen button is added to the right upper corner
macOS 10.10 a full screen button is added to the right upper corner
of a window's title bar.
Currently only available for wxOSX/Cocoa.