Applied patch [ 1776951 ] wxSizer::GetContainingWindow fails for nested sizers

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

diff --git a/src/palmos/utils.cpp b/src/palmos/utils.cpp
index 81988757cafbd73b2cd6bee5fa421d5af9df84f6..c8d8d849088c24b76fea28d52e80ba403c581343 100644 (file)
--- a/src/palmos/utils.cpp
+++ b/src/palmos/utils.cpp
@@ -29,16 +29,18 @@
     #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"
-#include "wx/timer.h"
+#include "wx/power.h"
 
 #include <MemoryMgr.h>
 #include <DLServer.h>
 #include <SoundMgr.h>
+#include <SysUtils.h>
 
 // ============================================================================
 // implementation
@@ -88,7 +90,7 @@ bool wxGetUserName(wxChar *buf, int maxSize)
         return false;
     }
 
-    wxStrncpy (buf, wxConvertMB2WX(id), maxSize - 1);
+    wxStrncpy (buf, wxSafeConvertMB2WX(id), maxSize - 1);
 
     // free the buffer
     MemPtrUnlock(id);
@@ -106,7 +108,7 @@ wxChar *wxGetUserHome(const wxString& WXUNUSED(user))
     return NULL;
 }
 
-bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
+bool wxGetDiskSpace(const wxString& path, wxDiskspaceSize_t *pTotal, wxDiskspaceSize_t *pFree)
 {
     return false;
 }
@@ -125,6 +127,11 @@ bool wxSetEnv(const wxString& var, const wxChar *value)
     return false;
 }
 
+bool wxUnsetEnv(const wxString& var)
+{
+    return false;
+}
+
 // ----------------------------------------------------------------------------
 // process management
 // ----------------------------------------------------------------------------
@@ -146,6 +153,10 @@ bool wxShutdown(wxShutdownFlags wFlags)
     return false;
 }
 
+// ----------------------------------------------------------------------------
+// power management
+// ----------------------------------------------------------------------------
+
 wxPowerType wxGetPowerType()
 {
     return wxPOWER_BATTERY;
@@ -191,6 +202,11 @@ void wxBell()
     SndPlaySystemSound(sndWarning);
 }
 
+bool wxIsPlatform64Bit()
+{
+    return false;
+}
+
 wxString wxGetOsDescription()
 {
     wxString strOS = _T("PalmOS");
@@ -209,11 +225,11 @@ wxString wxGetOsDescription()
     return strOS;
 }
 
-wxToolkitInfo& wxAppTraits::GetToolkitInfo()
+wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin)
 {
-    static wxToolkitInfo info;
-    info.name = _T("wxBase");
-    return info;
+    // TODO
+
+    return wxOS_UNKNOWN;
 }
 
 // ----------------------------------------------------------------------------
@@ -268,4 +284,3 @@ extern long wxCharsetToCodepage(const wxChar *name)
 }
 
 #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
-