Take best fitting type for available memory measurement.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-12-27 18:47:26 +00:00
parent 49a1436640
commit 9d8aca4832
8 changed files with 554 additions and 537 deletions

View File

@@ -4,7 +4,7 @@
// Author: William Osborne
// Modified by:
// Created: 10/13/04
// RCS-ID: $Id:
// RCS-ID: $Id:
// Copyright: (c) William Osborne
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -90,7 +90,7 @@ bool wxGetUserName(wxChar *buf, int maxSize)
wxStrncpy (buf, wxConvertMB2WX(id), maxSize - 1);
// free the buffer
// free the buffer
MemPtrUnlock(id);
return true;
@@ -156,7 +156,7 @@ bool wxShutdown(wxShutdownFlags wFlags)
// ----------------------------------------------------------------------------
// Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
long wxGetFreeMemory()
wxMemorySize wxGetFreeMemory()
{
uint32_t freeTotal = 0;
uint32_t freeHeap;
@@ -171,7 +171,7 @@ long wxGetFreeMemory()
freeTotal+=freeHeap;
}
return freeTotal;
return (wxMemorySize)freeTotal;
}
unsigned long wxGetProcessId()