font inheritance fixes (patch 983251)

[wxWidgets.git] / src / common / log.cpp

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 9ec3b7ae46373087ce446b4ad08f549f1c20a779..f4250830b41f36e539058f1e4353319587f7164e 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -30,7 +30,7 @@
 
 #if wxUSE_LOG
 
-// wxWindows
+// wxWidgets
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/arrstr.h"
@@ -745,7 +745,9 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode)
             0, NULL);
 
     // copy it to our buffer and free memory
-    if( lpMsgBuf != 0 ) {
+    // Crashes on SmartPhone
+#if !defined(__SMARTPHONE__)
+     if( lpMsgBuf != 0 ) {
         wxStrncpy(s_szBuf, (const wxChar *)lpMsgBuf, WXSIZEOF(s_szBuf) - 1);
         s_szBuf[WXSIZEOF(s_szBuf) - 1] = wxT('\0');
 
@@ -760,7 +762,9 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode)
                 s_szBuf[len - 2] = wxT('\0');
         }
     }
-    else {
+    else
+#endif
+    {
         s_szBuf[0] = wxT('\0');
     }