add wxScrollHelper::ShowScrollbars() (implemented for GTK only right now, generic...

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

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index deffb94e27633207c11f89d91cb71cb9979f131d..85e35c508236ead5b87218ade6eed99fde2c3fa6 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -436,8 +436,7 @@ bool wxGetEmailAddress(wxChar *address, int maxSize)
     if ( !email )
         return false;
 
-    wxStrncpy(address, email, maxSize - 1);
-    address[maxSize - 1] = wxT('\0');
+    wxStrlcpy(address, email.t_str(), maxSize);
 
     return true;
 }
@@ -963,7 +962,11 @@ bool wxLaunchDefaultApplication(const wxString& document, int flags)
     WinStruct<SHELLEXECUTEINFO> sei;
     sei.lpFile = document.wx_str();
     sei.lpVerb = _T("open");
+#ifdef __WXWINCE__
+    sei.nShow = SW_SHOWNORMAL; // SW_SHOWDEFAULT not defined under CE (#10216)
+#else
     sei.nShow = SW_SHOWDEFAULT;
+#endif
 
     // avoid Windows message box in case of error for consistency with
     // wxLaunchDefaultBrowser() even if don't show the error ourselves in this