Fixed bug: wxPropertyGridInterface::SetPropertyReadOnly() with wxPG_DONT_RECURSE...

[wxWidgets.git] / src / msdos / utilsdos.cpp

diff --git a/src/msdos/utilsdos.cpp b/src/msdos/utilsdos.cpp
index ff4647668c0a9df96f65fbcede49785be908e43f..d5c8a1a0fe2cb0357431f3f69dcd48b76d27b802 100644 (file)
--- a/src/msdos/utilsdos.cpp
+++ b/src/msdos/utilsdos.cpp
@@ -200,7 +200,7 @@ const wxChar* wxGetHomeDir(wxString *home)
 #endif
             // it needs to be a full path to be usable
             if ( prog.compare(1, 2, _T(":\\")) == 0 )
-                wxSplitPath(prog, &strDir, NULL, NULL);
+                wxFileName::SplitPath(prog, &strDir, NULL, NULL);
         }
         if ( strDir.empty() )
         {
@@ -233,7 +233,7 @@ bool wxGetUserId(wxChar *buf, int n)
     if (!user)
         user = _T("user");
 
-    wxStrncpy(buf, user, n);
+    wxStrlcpy(buf, user, n);
     return true;
 }
 
@@ -254,7 +254,7 @@ bool wxGetHostName(wxChar *buf, int n)
     if (!host)
         host = _T("host");
 
-    wxStrncpy(buf, host, n);
+    wxStrlcpy(buf, host, n);
     return true;
 }
 
@@ -321,7 +321,7 @@ long wxExecute(const wxString& command, int flags, wxProcess *process)
 
     argv[n] = NULL;
     while (n-- > 0)
-        argv[n] = wx_const_cast(wxChar*, (const char *)args[n].c_str());
+        argv[n] = const_cast<wxChar*>((const char *)args[n].c_str());
 
     long result = wxExecute(argv, flags, process);