Add some version checks to help compiling on OSX.

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

diff --git a/src/palmos/utils.cpp b/src/palmos/utils.cpp
index 3af6a90c6b20c9007d878d6c428257aa8c524fe8..d52e90fb352bf56d224999f7845b2de5024b8c8f 100644 (file)
--- a/src/palmos/utils.cpp
+++ b/src/palmos/utils.cpp
@@ -44,7 +44,7 @@
 #include <SystemMgr.h> // SysDoze()...
 #include <SysUtils.h>
 
-#ifdef defined (__WXPALMOS6__)
+#ifdef __WXPALMOS6__
 extern void SysReset (void);
 extern UInt32 SysTaskID (void);
 #endif
@@ -97,7 +97,7 @@ bool wxGetUserName(wxChar *buf, int maxSize)
         return false;
     }
 
-    wxStrncpy (buf, wxSafeConvertMB2WX(id), maxSize - 1);
+    wxStrlcpy(buf, wxSafeConvertMB2WX(id), maxSize);
 
     // free the buffer
     MemPtrUnlock(id);
@@ -165,7 +165,7 @@ bool wxShutdown(wxShutdownFlags wFlags)
     switch (wFlags) {
     case wxSHUTDOWN_POWEROFF:
         // TODO: turn off lamps
-#ifdef defined (__WXPALMOS6__)
+#ifdef __WXPALMOS6__
         //extern void SysReset (void);
         //extern UInt32 SysTaskID (void);
         #define SysReset()
@@ -251,7 +251,7 @@ bool wxIsPlatform64Bit()
 
 wxString wxGetOsDescription()
 {
-    wxString strOS = _T("PalmOS");
+    wxString strOS = wxT("PalmOS");
 
     //err = FtrGet(sysFtrCreator, sysFtrNumROMVersion, &romVersion);
     //if (romVersion >= 0x02000000) v20 = true;