Merge branch 'os_version'

Make strings returned by wxGetOsDescription() more readable for the users.
This commit is contained in:
Vadim Zeitlin
2015-09-06 14:24:57 +02:00
5 changed files with 43 additions and 8 deletions

View File

@@ -120,8 +120,6 @@ public:
Returns the search button visibility value.
If there is a menu attached, the search button will be visible regardless of
the search button visibility value.
This always returns @false in Mac OS X v10.3
*/
virtual bool IsSearchButtonVisible() const;
@@ -148,8 +146,6 @@ public:
Sets the search button visibility value on the search control.
If there is a menu attached, the search button will be visible regardless of
the search button visibility value.
This has no effect in Mac OS X v10.3
*/
virtual void ShowSearchButton(bool show);

View File

@@ -118,7 +118,6 @@
Tells wxListCtrl to use the generic control even when it is capable of
using the native control instead. Also known as wxMAC_ALWAYS_USE_GENERIC_LISTCTRL.
@flag{mac.textcontrol-use-spell-checker}
This option only has effect for Mac OS X 10.4 and higher.
If 1 activates the spell checking in wxTextCtrl.
@flag{osx.openfiledialog.always-show-types}
Per default a wxFileDialog with wxFD_OPEN does not show a types-popup on OS X but allows

View File

@@ -858,6 +858,7 @@ wxString wxGetOsDescription();
@beginTable
@row3col{<b>Windows OS name</b>, <b>Major version</b>, <b>Minor version</b>}
@row3col{Windows 10, 10, 0}
@row3col{Windows Server 2016, 10, 0}
@row3col{Windows 8.1, 6, 3}
@row3col{Windows Server 2012 R2, 6, 3}
@row3col{Windows 8, 6, 2}