Add wxWinVersion_7 to the private wxMSW wxWinVersion enum.
Also correct wxWinVersion_2003 definition, it should have the same value as wxWinVersion_XP. And add wxWinVersion_XP_SP2 == wxWinVersion_2003_SP1. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -876,9 +876,10 @@ inline wxString wxGetFullModuleName()
|
|||||||
// 0x0400 Windows 95, NT4
|
// 0x0400 Windows 95, NT4
|
||||||
// 0x0410 Windows 98
|
// 0x0410 Windows 98
|
||||||
// 0x0500 Windows ME, 2000
|
// 0x0500 Windows ME, 2000
|
||||||
// 0x0501 Windows XP
|
// 0x0501 Windows XP, 2003
|
||||||
// 0x0502 Windows 2003
|
// 0x0502 Windows XP SP2, 2003 SP1
|
||||||
// 0x0600 Longhorn
|
// 0x0600 Windows Vista, 2008
|
||||||
|
// 0x0601 Windows 7
|
||||||
//
|
//
|
||||||
// for the other Windows versions 0 is currently returned
|
// for the other Windows versions 0 is currently returned
|
||||||
enum wxWinVersion
|
enum wxWinVersion
|
||||||
@@ -898,11 +899,15 @@ enum wxWinVersion
|
|||||||
wxWinVersion_NT5 = wxWinVersion_5,
|
wxWinVersion_NT5 = wxWinVersion_5,
|
||||||
wxWinVersion_2000 = wxWinVersion_5,
|
wxWinVersion_2000 = wxWinVersion_5,
|
||||||
wxWinVersion_XP = 0x0501,
|
wxWinVersion_XP = 0x0501,
|
||||||
wxWinVersion_2003 = 0x0502,
|
wxWinVersion_2003 = 0x0501,
|
||||||
|
wxWinVersion_XP_SP2 = 0x0502,
|
||||||
|
wxWinVersion_2003_SP1 = 0x0502,
|
||||||
|
|
||||||
wxWinVersion_6 = 0x0600,
|
wxWinVersion_6 = 0x0600,
|
||||||
wxWinVersion_Vista = wxWinVersion_6,
|
wxWinVersion_Vista = wxWinVersion_6,
|
||||||
wxWinVersion_NT6 = wxWinVersion_6
|
wxWinVersion_NT6 = wxWinVersion_6,
|
||||||
|
|
||||||
|
wxWinVersion_7 = 0x601
|
||||||
};
|
};
|
||||||
|
|
||||||
WXDLLIMPEXP_BASE wxWinVersion wxGetWinVersion();
|
WXDLLIMPEXP_BASE wxWinVersion wxGetWinVersion();
|
||||||
|
Reference in New Issue
Block a user