Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed getting OS version information.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2006-08-30 17:14:57 +00:00
parent 5c351979c3
commit 930a9efaf1
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/os2/utils.cpp
View File

@@ -297,19 +297,18 @@ void wxBell()
wxString wxGetOsDescription()
{
wxString strVer(_T("OS/2"));
ULONG ulSysInfo[QSV_MAX] = {0};
ULONG ulSysInfo = 0;
if (::DosQuerySysInfo( 1L,
QSV_MAX,
(PVOID)ulSysInfo,
sizeof(ULONG) * QSV_MAX
if (::DosQuerySysInfo( QSV_VERSION_MINOR,
QSV_VERSION_MINOR,
(PVOID)&ulSysInfo,
sizeof(ULONG)
) == 0L )
{
wxString ver;
ver.Printf( _T(" ver. %d.%d rev. %c"),
int(ulSysInfo[QSV_VERSION_MAJOR] / 10),
int(ulSysInfo[QSV_VERSION_MINOR]),
char(ulSysInfo[QSV_VERSION_REVISION])
ver.Printf( _T(" ver. %d.%d"),
int(ulSysInfo / 10),
int(ulSysInfo % 10)
);
strVer += ver;
}
@@ -334,21 +333,21 @@ void wxAppTraits::TerminateGui(unsigned long WXUNUSED(ulHab))
wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin)
{
ULONG ulSysInfo[QSV_MAX] = {0};
ULONG ulSysInfo = 0;
APIRET ulrc;
ulrc = ::DosQuerySysInfo( 1L
,QSV_MAX
,(PVOID)ulSysInfo
,sizeof(ULONG) * QSV_MAX
ulrc = ::DosQuerySysInfo( QSV_VERSION_MINOR,
QSV_VERSION_MINOR,
(PVOID)&ulSysInfo,
sizeof(ULONG)
);
if (ulrc == 0L)
{
if ( verMaj )
*verMaj = ulSysInfo[QSV_VERSION_MAJOR] / 10;
*verMaj = ulSysInfo / 10;
if ( verMin )
*verMin = ulSysInfo[QSV_VERSION_MINOR];
*verMin = ulSysInfo % 10;
}
return wxOS_OS2;

5
src/os2/utilsgui.cpp
View File

@@ -437,9 +437,10 @@ void wxGUIAppTraits::TerminateGui(unsigned long ulHab)
::WinTerminate(ulHab);
}
wxPortId wxGUIAppTraits::GetToolkitVersion(int *WXUNUSED(verMaj), int *WXUNUSED(verMin)) const
wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const
{
// TODO: how to get version of PM ?
// How to get version of PM ? I guess, just reusing the OS version is OK.
(void) wxGetOsVersion(verMaj, verMin);
return wxPORT_OS2;
}