Add markup support to generic wxStaticText implementation.

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

diff --git a/src/msdos/utilsdos.cpp b/src/msdos/utilsdos.cpp
index ff4647668c0a9df96f65fbcede49785be908e43f..1b47458ab4a0f93084b5f19413fa5bc97ed9a555 100644 (file)
--- a/src/msdos/utilsdos.cpp
+++ b/src/msdos/utilsdos.cpp
@@ -100,7 +100,7 @@ static bool wxDoSetEnv(const wxString& variable, const char *value)
 {
     wxString s = variable;
     if ( value )
 {
     wxString s = variable;
     if ( value )

-        s << _T('=') << value;
+        s << wxT('=') << value;

 
     // transform to ANSI
     const char *p = s.mb_str();
 
     // transform to ANSI
     const char *p = s.mb_str();


@@ -179,7 +179,7 @@ const wxChar* wxGetHomeDir(wxString *home)
         {
             strDir = szHome;
             // when msys sets %HOME% it uses '/' (cygwin uses '\\')
         {
             strDir = szHome;
             // when msys sets %HOME% it uses '/' (cygwin uses '\\')

-            strDir.Replace(_T("/"), _T("\\"));
+            strDir.Replace(wxT("/"), wxT("\\"));

         }
     }
 
         }
     }
 


@@ -196,15 +196,15 @@ const wxChar* wxGetHomeDir(wxString *home)
             wxString prog(wxTheApp->argv[0]);
 #ifdef __DJGPP__
             // djgpp startup code switches the slashes around, so restore them
             wxString prog(wxTheApp->argv[0]);
 #ifdef __DJGPP__
             // djgpp startup code switches the slashes around, so restore them

-            prog.Replace(_T("/"), _T("\\"));
+            prog.Replace(wxT("/"), wxT("\\"));

 #endif
             // it needs to be a full path to be usable
 #endif
             // it needs to be a full path to be usable

-            if ( prog.compare(1, 2, _T(":\\")) == 0 )
-                wxSplitPath(prog, &strDir, NULL, NULL);
+            if ( prog.compare(1, 2, wxT(":\\")) == 0 )
+                wxFileName::SplitPath(prog, &strDir, NULL, NULL);

         }
         if ( strDir.empty() )
         {
         }
         if ( strDir.empty() )
         {

-            strDir = _T(".");
+            strDir = wxT(".");

         }
     }
 
         }
     }
 


@@ -225,15 +225,15 @@ wxString wxGetUserHome(const wxString& user)
 //
 bool wxGetUserId(wxChar *buf, int n)
 {
 //
 bool wxGetUserId(wxChar *buf, int n)
 {

-    const wxChar *user = wxGetenv(_T("UserName"));
+    const wxChar *user = wxGetenv(wxT("UserName"));

 
     if (!user)
 
     if (!user)

-        user = wxGetenv(_T("USER"));
+        user = wxGetenv(wxT("USER"));

 
     if (!user)
 
     if (!user)

-        user = _T("user");
+        user = wxT("user");

 
 

-    wxStrncpy(buf, user, n);
+    wxStrlcpy(buf, user, n);

     return true;
 }
 
     return true;
 }
 


@@ -246,15 +246,15 @@ bool wxGetUserName(wxChar *buf, int n)
 //
 bool wxGetHostName(wxChar *buf, int n)
 {
 //
 bool wxGetHostName(wxChar *buf, int n)
 {

-    const wxChar *host = wxGetenv(_T("ComputerName"));
+    const wxChar *host = wxGetenv(wxT("ComputerName"));

 
     if (!host)
 
     if (!host)

-        host = wxGetenv(_T("HOSTNAME"));
+        host = wxGetenv(wxT("HOSTNAME"));

 
     if (!host)
 
     if (!host)

-        host = _T("host");
+        host = wxT("host");

 
 

-    wxStrncpy(buf, host, n);
+    wxStrlcpy(buf, host, n);

     return true;
 }
 
     return true;
 }
 


@@ -264,10 +264,10 @@ bool wxGetFullHostName(wxChar *buf, int n)
 {
     wxGetHostName(buf, n);
 
 {
     wxGetHostName(buf, n);
 

-    const wxChar *domain = wxGetenv(_T("UserDnsDomain"));
+    const wxChar *domain = wxGetenv(wxT("UserDnsDomain"));

 
     if (domain)
 
     if (domain)

-        wxStrncat(wxStrncat(buf, _T("."), n), domain, n);
+        wxStrncat(wxStrncat(buf, wxT("."), n), domain, n);

 
     return true;
 }
 
     return true;
 }


@@ -293,7 +293,7 @@ int wxKill(long pid, wxSignal sig, wxKillError *rc, int WXUNUSED(flags))
     }
     else
     {
     }
     else
     {

-        wxLogDebug(_T("wxKill can only send signals to the current process under MSDOS"));
+        wxLogDebug(wxT("wxKill can only send signals to the current process under MSDOS"));

         if (rc)
             *rc = wxKILL_NO_PROCESS;
     }
         if (rc)
             *rc = wxKILL_NO_PROCESS;
     }


@@ -307,12 +307,15 @@ bool wxShell(const wxString& command /*=wxEmptyString*/)
     int result = system(command);
 
     if (result == -1)
     int result = system(command);
 
     if (result == -1)

+    {

         wxLogSysError(_("can't execute '%s'"), command.c_str());
         wxLogSysError(_("can't execute '%s'"), command.c_str());

+    }

 
     return result == 0;
 }
 
 
     return result == 0;
 }
 

-long wxExecute(const wxString& command, int flags, wxProcess *process)
+long wxExecute(const wxString& command, int flags, wxProcess *process,
+        const wxExecuteEnv *env)

 {
     // FIXME: shouldn't depend on wxCmdLineParser
     wxArrayString args(wxCmdLineParser::ConvertStringToArgs(command));
 {
     // FIXME: shouldn't depend on wxCmdLineParser
     wxArrayString args(wxCmdLineParser::ConvertStringToArgs(command));


@@ -321,7 +324,7 @@ long wxExecute(const wxString& command, int flags, wxProcess *process)
 
     argv[n] = NULL;
     while (n-- > 0)
 
     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);
 
 
     long result = wxExecute(argv, flags, process);
 


@@ -337,7 +340,7 @@ class wxTempFileInStream : public wxFFileInputStream
 {
 public:
     wxTempFileInStream(const wxString& name)
 {
 public:
     wxTempFileInStream(const wxString& name)

-        : wxFFileInputStream(name, _T("rt"))
+        : wxFFileInputStream(name, wxT("rt"))

     { }
 
     virtual ~wxTempFileInStream()
     { }
 
     virtual ~wxTempFileInStream()


@@ -407,7 +410,9 @@ bool wxRedirectableFd::Reopen(const wxString& name, int flags)
     }
 
     if (!result)
     }
 
     if (!result)

+    {

         wxLogSysError(_("error opening '%s'"), name.c_str());
         wxLogSysError(_("error opening '%s'"), name.c_str());

+    }

 
     return result;
 }
 
     return result;
 }


@@ -435,7 +440,8 @@ wxString wxRedirectableFd::Release()
 
 // wxExecute implementation
 //
 
 // wxExecute implementation
 //

-long wxExecute(wxChar **argv, int flags, wxProcess *process)
+long wxExecute(wxChar **argv, int flags, wxProcess *process,
+        const wxString* cwd, const wxEnvVariableHashMap* env)

 {
 #if wxUSE_STREAMS
     const int STDIN = 0;
 {
 #if wxUSE_STREAMS
     const int STDIN = 0;


@@ -448,14 +454,14 @@ long wxExecute(wxChar **argv, int flags, wxProcess *process)
     if (redirect)
     {
         // close stdin/out/err and reopen them as files
     if (redirect)
     {
         // close stdin/out/err and reopen them as files

-        if (!in.Reopen(_T("NUL"), O_RDONLY | O_TEXT))
+        if (!in.Reopen(wxT("NUL"), O_RDONLY | O_TEXT))

             return -1;
 
             return -1;
 

-        if (!out.Reopen(wxFileName::CreateTempFileName(_T("out")),
+        if (!out.Reopen(wxFileName::CreateTempFileName(wxT("out")),

                         O_CREAT | O_WRONLY | O_TRUNC | O_TEXT))
             return -1;
 
                         O_CREAT | O_WRONLY | O_TRUNC | O_TEXT))
             return -1;
 

-        if (!err.Reopen(wxFileName::CreateTempFileName(_T("err")),
+        if (!err.Reopen(wxFileName::CreateTempFileName(wxT("err")),

                         O_CREAT | O_WRONLY | O_TRUNC | O_TEXT))
             return -1;
     }
                         O_CREAT | O_WRONLY | O_TRUNC | O_TEXT))
             return -1;
     }


@@ -466,12 +472,14 @@ long wxExecute(wxChar **argv, int flags, wxProcess *process)
     int result = spawnvp(mode, argv[0], argv);
 
     if (result == -1)
     int result = spawnvp(mode, argv[0], argv);
 
     if (result == -1)

+    {

         wxLogSysError(_("can't execute '%s'"), argv[0]);
         wxLogSysError(_("can't execute '%s'"), argv[0]);

+    }

 
 #if wxUSE_STREAMS
     if (redirect)
         process->SetPipeStreams(new wxTempFileInStream(out.Release()),
 
 #if wxUSE_STREAMS
     if (redirect)
         process->SetPipeStreams(new wxTempFileInStream(out.Release()),

-                                new wxFFileOutputStream(_T("NUL"), _T("wt")),
+                                new wxFFileOutputStream(wxT("NUL"), wxT("wt")),

                                 new wxTempFileInStream(err.Release()));
 #endif // wxUSE_STREAMS
 
                                 new wxTempFileInStream(err.Release()));
 #endif // wxUSE_STREAMS
 


@@ -485,7 +493,7 @@ long wxExecute(wxChar **argv, int flags, wxProcess *process)
 
 wxString wxGetOsDescription()
 {
 
 wxString wxGetOsDescription()
 {

-    wxString osname(_T("DOS"));
+    wxString osname(wxT("DOS"));

     return osname;
 }
 
     return osname;
 }