From 5a23a495e428c85c9a4e2581ef47d5eaf3aece1c Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Thu, 1 Sep 2005 17:04:08 +0000 Subject: [PATCH] Missing wxGetOsDescription(). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/os2/utils.cpp | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp index cbec9f74c1..323687354e 100644 --- a/src/os2/utils.cpp +++ b/src/os2/utils.cpp @@ -211,10 +211,10 @@ wxBatteryState wxGetBatteryState() // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX) wxMemorySize wxGetFreeMemory() { - void* pMemptr = NULL; - LONG lSize; - ULONG lMemFlags; - APIRET rc; + void* pMemptr = NULL; + LONG lSize; + ULONG lMemFlags; + APIRET rc; lMemFlags = PAG_FREE; rc = ::DosQueryMem(pMemptr, (PULONG)&lSize, &lMemFlags); @@ -362,6 +362,28 @@ void wxBell() DosBeep(1000,1000); // 1kHz during 1 sec. } +wxString wxGetOsDescription() +{ + wxString strVer(_T("OS/2")); + ULONG ulSysInfo[QSV_MAX] = {0}; + + if (::DosQuerySysInfo( 1L, + QSV_MAX, + (PVOID)ulSysInfo, + sizeof(ULONG) * QSV_MAX + ) == 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]) + ); + strVer += ver; + } + + return strVer; +} void wxAppTraits::InitializeGui(unsigned long &WXUNUSED(ulHab)) { @@ -428,8 +450,8 @@ const wxMB2WXbuf wxGetUserHome( const wxString &rUser ) wxChar* wxGetUserHome ( const wxString &rUser ) #endif { - wxChar* zHome; - wxString sUser1(rUser); + wxChar* zHome; + wxString sUser1(rUser); wxChar *wxBuffer = new wxChar[256]; #ifndef __EMX__ @@ -451,7 +473,7 @@ wxChar* wxGetUserHome ( const wxString &rUser ) return *zHome ? zHome : (wxChar*)_T("\\"); } if (wxStricmp(zTmp, WXSTRINGCAST sUser1) == 0) - sUser1 = _T(""); + sUser1 = wxEmptyString; } } #endif -- 2.45.2