Commited Bryan Petty's blind fix patch.

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

diff --git a/src/palmos/utils.cpp b/src/palmos/utils.cpp
index e32477f327e8d9c2ceb286adc89cf2192b92b3b9..f1f40adad7774ad0f40a9fed7d76265463f415d9 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
 /////////////////////////////////////////////////////////////////////////////
 


@@ -29,16 +29,18 @@
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/timer.h"

 #endif  //WX_PRECOMP
 
 #include "wx/apptrait.h"
 #include "wx/dynload.h"
 #include "wx/confbase.h"
 #endif  //WX_PRECOMP
 
 #include "wx/apptrait.h"
 #include "wx/dynload.h"
 #include "wx/confbase.h"

-#include "wx/timer.h"
+#include "wx/power.h"

 
 #include <MemoryMgr.h>
 #include <DLServer.h>
 #include <SoundMgr.h>
 
 #include <MemoryMgr.h>
 #include <DLServer.h>
 #include <SoundMgr.h>

+#include <SysUtils.h>

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


@@ -106,12 +108,7 @@ 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)
+bool wxGetDiskSpace(const wxString& path, wxDiskspaceSize_t *pTotal, wxDiskspaceSize_t *pFree)

 {
     return false;
 }
 {
     return false;
 }


@@ -151,6 +148,21 @@ bool wxShutdown(wxShutdownFlags wFlags)
     return false;
 }
 
     return false;
 }
 

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

 // ----------------------------------------------------------------------------
 // misc
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // misc
 // ----------------------------------------------------------------------------


@@ -187,16 +199,27 @@ void wxBell()
 
 wxString wxGetOsDescription()
 {
 
 wxString wxGetOsDescription()
 {

-    wxString str;
+    wxString strOS = _T("PalmOS");

 
 

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

 }
 
 }
 

-wxToolkitInfo& wxAppTraits::GetToolkitInfo()
+wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin)

 {
 {

-    static wxToolkitInfo info;
-    info.name = _T("wxBase");
-    return info;
+    // TODO
+
+    return wxOS_UNKNOWN;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -251,4 +274,3 @@ extern long wxCharsetToCodepage(const wxChar *name)
 }
 
 #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
 }
 
 #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP

-