make wxSetEnv compatible with ANSI and Unicode, deprecate passing NULL to it in favou...

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

diff --git a/src/palmos/utils.cpp b/src/palmos/utils.cpp
index 3185ed3ea6194e47390bc88f772b7f5974636c3c..c8d8d849088c24b76fea28d52e80ba403c581343 100644 (file)
--- a/src/palmos/utils.cpp
+++ b/src/palmos/utils.cpp
@@ -29,12 +29,13 @@
     #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 <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);


@@ -126,6 +127,11 @@ bool wxSetEnv(const wxString& var, const wxChar *value)
     return false;
 }
 
     return false;
 }
 

+bool wxUnsetEnv(const wxString& var)
+{
+    return false;
+}
+

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


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

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

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


@@ -192,6 +202,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 +225,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;

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


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

-