wxRichTextCtrl native caret now flashes, for wxMac/Core Graphics mode

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

diff --git a/src/palmos/utils.cpp b/src/palmos/utils.cpp
index 3af6a90c6b20c9007d878d6c428257aa8c524fe8..a03694b0dc755599a27d0470cc31ff6f921c48d3 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()