Added missing include

[wxWidgets.git] / src / palmos / utils.cpp

diff --git a/src/palmos/utils.cpp b/src/palmos/utils.cpp
index 934ab62e50aa2f7a4ad584bb40b70e65599a8e70..845aae1033f51efcedf27c6126a9509fc8dcd9ad 100644 (file)
--- a/src/palmos/utils.cpp
+++ b/src/palmos/utils.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        palmos/utils.cpp
+// Name:        src/palmos/utils.cpp

 // Purpose:     Various utilities
 // Purpose:     Various utilities

-// Author:      William Osborne
-// Modified by:
+// Author:      William Osborne - minimal working wxPalmOS port
+// Modified by: Wlodzimierz ABX Skiba - real functionality

 // Created:     10/13/04
 // Created:     10/13/04

-// RCS-ID:      $Id: 
-// Copyright:   (c) William Osborne
+// RCS-ID:      $Id$
+// Copyright:   (c) William Osborne, Wlodzimierz Skiba

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -33,28 +33,13 @@
 
 #include "wx/apptrait.h"
 #include "wx/dynload.h"
 
 #include "wx/apptrait.h"
 #include "wx/dynload.h"

-
-#include "wx/confbase.h"        // for wxExpandEnvVars()
-
+#include "wx/confbase.h"

 #include "wx/timer.h"
 
 #include "wx/timer.h"
 

-// VZ: there is some code using NetXXX() functions to get the full user name:
-//     I don't think it's a good idea because they don't work under Win95 and
-//     seem to return the same as wxGetUserId() under NT. If you really want
-//     to use them, just #define USE_NET_API
-#undef USE_NET_API
-
-#ifdef USE_NET_API
-    #include <lm.h>
-#endif // USE_NET_API
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// In the WIN.INI file
-static const wxChar WX_SECTION[] = wxT("wxWindows");
-static const wxChar eUSERNAME[]  = wxT("UserName");
+#include <MemoryMgr.h>
+#include <DLServer.h>
+#include <SoundMgr.h>
+#include <SysUtils.h>

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -79,13 +64,37 @@ bool wxGetFullHostName(wxChar *buf, int maxSize)
 // Get user ID e.g. jacs
 bool wxGetUserId(wxChar *buf, int maxSize)
 {
 // Get user ID e.g. jacs
 bool wxGetUserId(wxChar *buf, int maxSize)
 {

-    return false;
+    return wxGetUserName(buf, maxSize);

 }
 
 // Get user name e.g. Julian Smart
 bool wxGetUserName(wxChar *buf, int maxSize)
 {
 }
 
 // Get user name e.g. Julian Smart
 bool wxGetUserName(wxChar *buf, int maxSize)
 {

-    return false;
+    *buf = wxT('\0');
+
+    // buffer allocation
+    MemHandle handle = MemHandleNew(maxSize-1);
+    if( handle == NULL )
+        return false;
+
+    // lock the buffer
+    char *id = (char *)MemHandleLock(handle);
+    if( id == NULL )
+        return false;
+
+    // get user's name
+    if( DlkGetSyncInfo(NULL, NULL, NULL, id, NULL, NULL) != errNone )
+    {
+        MemPtrUnlock(id);
+        return false;
+    }
+
+    wxStrncpy (buf, wxConvertMB2WX(id), maxSize - 1);
+
+    // free the buffer
+    MemPtrUnlock(id);
+
+    return true;

 }
 
 const wxChar* wxGetHomeDir(wxString *pstr)
 }
 
 const wxChar* wxGetHomeDir(wxString *pstr)


@@ -98,11 +107,6 @@ wxChar *wxGetUserHome(const wxString& WXUNUSED(user))
     return NULL;
 }
 
     return NULL;
 }
 

-bool wxDirExists(const wxString& dir)
-{
-    return false;
-}
-

 bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 {
     return false;
 bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 {
     return false;


@@ -143,14 +147,38 @@ bool wxShutdown(wxShutdownFlags wFlags)
     return false;
 }
 
     return false;
 }
 

+wxPowerType wxGetPowerType()
+{
+    return wxPOWER_BATTERY;
+}
+
+wxBatteryState wxGetBatteryState()
+{
+    // TODO
+    return wxBATTERY_UNKNOWN_STATE;
+}
+

 // ----------------------------------------------------------------------------
 // misc
 // ----------------------------------------------------------------------------
 
 // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
 // ----------------------------------------------------------------------------
 // misc
 // ----------------------------------------------------------------------------
 
 // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)

-long wxGetFreeMemory()
+wxMemorySize wxGetFreeMemory()

 {
 {

-    return 0;
+    uint32_t freeTotal = 0;
+    uint32_t freeHeap;
+    uint32_t freeChunk;
+
+    // executed twice: for the dynamic heap, and for the non-secure RAM storage heap
+    for ( uint16_t i=0; i<MemNumRAMHeaps(); i++)
+    {
+        status_t err = MemHeapFreeBytes(i, &freeHeap, &freeChunk);
+        if( err != errNone )
+            return -1;
+        freeTotal+=freeHeap;
+    }
+
+    return (wxMemorySize)freeTotal;

 }
 
 unsigned long wxGetProcessId()
 }
 
 unsigned long wxGetProcessId()


@@ -161,18 +189,31 @@ unsigned long wxGetProcessId()
 // Emit a beeeeeep
 void wxBell()
 {
 // Emit a beeeeeep
 void wxBell()
 {

+    SndPlaySystemSound(sndWarning);

 }
 
 wxString wxGetOsDescription()
 {
 }
 
 wxString wxGetOsDescription()
 {

-    wxString str;
-
-    return str;
+    wxString strOS = _T("PalmOS");
+
+    char *version = SysGetOSVersionString();
+    if(version)
+    {
+        wxString str = wxString::FromAscii(version);
+        MemPtrFree(version);
+        if(!str.empty())
+        {
+            strOS << _(" ") << str;
+        }
+    }
+
+    return strOS;

 }
 
 wxToolkitInfo& wxAppTraits::GetToolkitInfo()
 {
     static wxToolkitInfo info;
 }
 
 wxToolkitInfo& wxAppTraits::GetToolkitInfo()
 {
     static wxToolkitInfo info;

+    info.os = wxPALMOS;

     info.name = _T("wxBase");
     return info;
 }
     info.name = _T("wxBase");
     return info;
 }


@@ -222,8 +263,6 @@ extern long wxCharsetToCodepage(const wxChar *name)
 
 #else // !wxUSE_FONTMAP
 
 
 #else // !wxUSE_FONTMAP
 

-#include "wx/palmos/registry.h"
-

 // this should work if Internet Exploiter is installed
 extern long wxCharsetToCodepage(const wxChar *name)
 {
 // this should work if Internet Exploiter is installed
 extern long wxCharsetToCodepage(const wxChar *name)
 {