X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d8aca4832f9052729d2fc51d25c23f6d7006cab..a67f1484e05419aafe3cd4791babd4cbae41791f:/src/os2/utils.cpp diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp index 678f7c0edc..1ee5362ef4 100644 --- a/src/os2/utils.cpp +++ b/src/os2/utils.cpp @@ -204,16 +204,28 @@ bool wxShutdown(wxShutdownFlags wFlags) return false; } +wxPowerType wxGetPowerType() +{ + // TODO + return wxPOWER_UNKNOWN; +} + +wxBatteryState wxGetBatteryState() +{ + // TODO + return wxBATTERY_UNKNOWN_STATE; +} + // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX) wxMemorySize wxGetFreeMemory() { void* pMemptr = NULL; - ULONG lSize; + LONG lSize; ULONG lMemFlags; APIRET rc; lMemFlags = PAG_FREE; - rc = ::DosQueryMem(pMemptr, &lSize, &lMemFlags); + rc = ::DosQueryMem(pMemptr, (PULONG)&lSize, &lMemFlags); if (rc != 0) lSize = -1L; return (wxMemorySize)lSize; @@ -419,7 +431,7 @@ wxChar* wxGetUserHome ( char *wxBuffer = new wxChar[256]; #ifndef __EMX__ - if (sUser1 != _T("")) + if (!sUser1.empty()) { wxChar zTmp[64]; @@ -441,7 +453,7 @@ wxChar* wxGetUserHome ( } } #endif - if (sUser1 == _T("")) + if (sUser1.empty()) { if ((zHome = wxGetenv(_T("HOME"))) != NULL) { @@ -456,13 +468,6 @@ wxChar* wxGetUserHome ( return NULL; // No home known! } -bool wxDirExists( - const wxString& rDir -) -{ - return (::DosSetCurrentDir(WXSTRINGCAST rDir)); -} - wxString WXDLLEXPORT wxPMErrorToStr( ERRORID vError )