don't lock the gs_prevCS critical section recursively (replaces patch 1857581)

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

diff --git a/src/palmos/utils.cpp b/src/palmos/utils.cpp
index e35d21ae23058848444dccb2692f7e66873aaea7..f63cfb67ee3b972c8aad0425ba30c51ac72985e4 100644 (file)
--- a/src/palmos/utils.cpp
+++ b/src/palmos/utils.cpp
@@ -35,6 +35,7 @@
 #include "wx/apptrait.h"
 #include "wx/dynload.h"
 #include "wx/confbase.h"
 #include "wx/apptrait.h"
 #include "wx/dynload.h"
 #include "wx/confbase.h"

+#include "wx/power.h"

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


@@ -89,7 +90,7 @@ bool wxGetUserName(wxChar *buf, int maxSize)
         return false;
     }
 
         return false;
     }
 

-    wxStrncpy (buf, wxConvertMB2WX(id), maxSize - 1);
+    wxStrncpy (buf, wxSafeConvertMB2WX(id), maxSize - 1);

 
     // free the buffer
     MemPtrUnlock(id);
 
     // free the buffer
     MemPtrUnlock(id);


@@ -102,9 +103,9 @@ const wxChar* wxGetHomeDir(wxString *pstr)
     return NULL;
 }
 
     return NULL;
 }
 

-wxChar *wxGetUserHome(const wxString& WXUNUSED(user))
+wxString wxGetUserHome(const wxString& WXUNUSED(user))

 {
 {

-    return NULL;
+    return wxString();

 }
 
 bool wxGetDiskSpace(const wxString& path, wxDiskspaceSize_t *pTotal, wxDiskspaceSize_t *pFree)
 }
 
 bool wxGetDiskSpace(const wxString& path, wxDiskspaceSize_t *pTotal, wxDiskspaceSize_t *pFree)


@@ -121,10 +122,17 @@ bool wxGetEnv(const wxString& var, wxString *value)
     return false;
 }
 
     return false;
 }
 

+#if ! WXWIN_COMPATIBILITY_2_8

 bool wxSetEnv(const wxString& var, const wxChar *value)
 {
     return false;
 }
 bool wxSetEnv(const wxString& var, const wxChar *value)
 {
     return false;
 }

+#endif // ! WXWIN_COMPATIBILITY_2_8
+
+bool wxUnsetEnv(const wxString& var)
+{
+    return false;
+}

 
 // ----------------------------------------------------------------------------
 // process management
 
 // ----------------------------------------------------------------------------
 // process management


@@ -147,6 +155,10 @@ bool wxShutdown(wxShutdownFlags wFlags)
     return false;
 }
 
     return false;
 }
 

+// ----------------------------------------------------------------------------
+// power management
+// ----------------------------------------------------------------------------
+

 wxPowerType wxGetPowerType()
 {
     return wxPOWER_BATTERY;
 wxPowerType wxGetPowerType()
 {
     return wxPOWER_BATTERY;


@@ -192,6 +204,11 @@ void wxBell()
     SndPlaySystemSound(sndWarning);
 }
 
     SndPlaySystemSound(sndWarning);
 }
 

+bool wxIsPlatform64Bit()
+{
+    return false;
+}
+

 wxString wxGetOsDescription()
 {
     wxString strOS = _T("PalmOS");
 wxString wxGetOsDescription()
 {
     wxString strOS = _T("PalmOS");


@@ -210,12 +227,11 @@ wxString wxGetOsDescription()
     return strOS;
 }
 
     return strOS;
 }
 

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

 {
 {

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

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