Don't link with media lib with USE_MEDIA==0.

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

diff --git a/src/palmos/utils.cpp b/src/palmos/utils.cpp
index f0cb433e0eaf3fbef84bd9350d10abb2ac17dd57..3185ed3ea6194e47390bc88f772b7f5974636c3c 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
 /////////////////////////////////////////////////////////////////////////////
 


@@ -39,6 +39,7 @@
 #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 +107,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;
 }


@@ -204,6 +200,7 @@ wxString wxGetOsDescription()
     if(version)
     {
         wxString str = wxString::FromAscii(version);
     if(version)
     {
         wxString str = wxString::FromAscii(version);

+        MemPtrFree(version);

         if(!str.empty())
         {
             strOS << _(" ") << str;
         if(!str.empty())
         {
             strOS << _(" ") << str;


@@ -216,6 +213,7 @@ wxString wxGetOsDescription()
 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;
 }