Return wxWinVersion_[78] correctly from wxMSW wxGetWinVersion().
This is especially important because the workaround of r76152 for IFileDialog bug under Windows Vista also applied under later Windows versions as they were not detected correctly. Closes #16286. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -899,6 +899,7 @@ inline wxString wxGetFullModuleName()
|
|||||||
// 0x0502 Windows XP SP2, 2003 SP1
|
// 0x0502 Windows XP SP2, 2003 SP1
|
||||||
// 0x0600 Windows Vista, 2008
|
// 0x0600 Windows Vista, 2008
|
||||||
// 0x0601 Windows 7
|
// 0x0601 Windows 7
|
||||||
|
// 0x0602 Windows 8 (currently also returned for 8.1)
|
||||||
//
|
//
|
||||||
// for the other Windows versions 0 is currently returned
|
// for the other Windows versions 0 is currently returned
|
||||||
enum wxWinVersion
|
enum wxWinVersion
|
||||||
@@ -926,7 +927,9 @@ enum wxWinVersion
|
|||||||
wxWinVersion_Vista = wxWinVersion_6,
|
wxWinVersion_Vista = wxWinVersion_6,
|
||||||
wxWinVersion_NT6 = wxWinVersion_6,
|
wxWinVersion_NT6 = wxWinVersion_6,
|
||||||
|
|
||||||
wxWinVersion_7 = 0x601
|
wxWinVersion_7 = 0x601,
|
||||||
|
|
||||||
|
wxWinVersion_8 = 0x602
|
||||||
};
|
};
|
||||||
|
|
||||||
WXDLLIMPEXP_BASE wxWinVersion wxGetWinVersion();
|
WXDLLIMPEXP_BASE wxWinVersion wxGetWinVersion();
|
||||||
|
@@ -1478,10 +1478,19 @@ wxWinVersion wxGetWinVersion()
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case 6:
|
case 6:
|
||||||
return wxWinVersion_NT6;
|
switch ( verMin )
|
||||||
|
{
|
||||||
|
case 0:
|
||||||
|
return wxWinVersion_Vista;
|
||||||
|
|
||||||
|
case 1:
|
||||||
|
return wxWinVersion_7;
|
||||||
|
|
||||||
|
case 2:
|
||||||
|
return wxWinVersion_8;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
default:
|
default:
|
||||||
// Do nothing just to silence GCC warning
|
// Do nothing just to silence GCC warning
|
||||||
break;
|
break;
|
||||||
|
Reference in New Issue
Block a user