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

Missing wxGetOsDescription().

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-09-01 17:04:08 +00:00
parent e7cc2f6502
commit 5a23a495e4
1 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/os2/utils.cpp
View File

@@ -211,10 +211,10 @@ wxBatteryState wxGetBatteryState()
// Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX) // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
wxMemorySize wxGetFreeMemory() wxMemorySize wxGetFreeMemory()
{ {
void* pMemptr = NULL; void* pMemptr = NULL;
LONG lSize; LONG lSize;
ULONG lMemFlags; ULONG lMemFlags;
APIRET rc; APIRET rc;
lMemFlags = PAG_FREE; lMemFlags = PAG_FREE;
rc = ::DosQueryMem(pMemptr, (PULONG)&lSize, &lMemFlags); rc = ::DosQueryMem(pMemptr, (PULONG)&lSize, &lMemFlags);
@@ -362,6 +362,28 @@ void wxBell()
DosBeep(1000,1000); // 1kHz during 1 sec. 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)) void wxAppTraits::InitializeGui(unsigned long &WXUNUSED(ulHab))
{ {
@@ -428,8 +450,8 @@ const wxMB2WXbuf wxGetUserHome( const wxString &rUser )
wxChar* wxGetUserHome ( const wxString &rUser ) wxChar* wxGetUserHome ( const wxString &rUser )
#endif #endif
{ {
wxChar* zHome; wxChar* zHome;
wxString sUser1(rUser); wxString sUser1(rUser);
wxChar *wxBuffer = new wxChar[256]; wxChar *wxBuffer = new wxChar[256];
#ifndef __EMX__ #ifndef __EMX__
@@ -451,7 +473,7 @@ wxChar* wxGetUserHome ( const wxString &rUser )
return *zHome ? zHome : (wxChar*)_T("\\"); return *zHome ? zHome : (wxChar*)_T("\\");
} }
if (wxStricmp(zTmp, WXSTRINGCAST sUser1) == 0) if (wxStricmp(zTmp, WXSTRINGCAST sUser1) == 0)
sUser1 = _T(""); sUser1 = wxEmptyString;
} }
} }
#endif #endif