revert unintended changes in previous commit

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

diff --git a/src/msdos/utilsdos.cpp b/src/msdos/utilsdos.cpp
index f0a227f696f911808a816fd9fcb7a56402e99d2c..189009fdeee0791b5ff527801b8fee916e5cc80b 100644 (file)
--- a/src/msdos/utilsdos.cpp
+++ b/src/msdos/utilsdos.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        utils.cpp
+// Name:        src/msdos/utils.cpp

 // Purpose:     DOS implementations of utility functions
 // Author:      Vaclav Slavik, M.J.Wetherell
 // Id:          $Id$
 // Purpose:     DOS implementations of utility functions
 // Author:      Vaclav Slavik, M.J.Wetherell
 // Id:          $Id$


@@ -16,14 +16,17 @@
 #endif
 
 #include "wx/utils.h"
 #endif
 
 #include "wx/utils.h"

-#include "wx/string.h"

 
 

-#include "wx/intl.h"
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
+#endif
+

 #include "wx/apptrait.h"
 #include "wx/apptrait.h"

-#include "wx/log.h"

 #include "wx/process.h"
 #include "wx/confbase.h"        // for wxExpandEnvVars()
 #include "wx/process.h"
 #include "wx/confbase.h"        // for wxExpandEnvVars()

-#include "wx/app.h"

 #include "wx/cmdline.h"
 #include "wx/filename.h"
 #include "wx/wfstream.h"
 #include "wx/cmdline.h"
 #include "wx/filename.h"
 #include "wx/wfstream.h"


@@ -85,12 +88,12 @@ bool wxGetEnv(const wxString& var, wxString *value)
     // wxGetenv is defined as getenv()
     wxChar *p = wxGetenv(var);
     if ( !p )
     // wxGetenv is defined as getenv()
     wxChar *p = wxGetenv(var);
     if ( !p )

-        return FALSE;
+        return false;

 
     if ( value )
         *value = p;
 
 
     if ( value )
         *value = p;
 

-    return TRUE;
+    return true;

 }
 
 bool wxSetEnv(const wxString& variable, const wxChar *value)
 }
 
 bool wxSetEnv(const wxString& variable, const wxChar *value)


@@ -233,7 +236,7 @@ bool wxGetUserName(wxChar *buf, int n)
 bool wxGetHostName(wxChar *buf, int n)
 {
     const wxChar *host = wxGetenv(_T("ComputerName"));
 bool wxGetHostName(wxChar *buf, int n)
 {
     const wxChar *host = wxGetenv(_T("ComputerName"));

-    
+

     if (!host)
         host = wxGetenv(_T("HOSTNAME"));
 
     if (!host)
         host = wxGetenv(_T("HOSTNAME"));
 


@@ -318,7 +321,7 @@ long wxExecute(const wxString& command, int flags, wxProcess *process)
 #if wxUSE_STREAMS
 
 // A wxFFileInputStream that deletes the file in it's destructor
 #if wxUSE_STREAMS
 
 // A wxFFileInputStream that deletes the file in it's destructor

-// 
+//

 class wxTempFileInStream : public wxFFileInputStream
 {
 public:
 class wxTempFileInStream : public wxFFileInputStream
 {
 public:


@@ -477,3 +480,13 @@ wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()
     info.os = wxDOS;
     return info;
 }
     info.os = wxDOS;
     return info;
 }

+
+//----------------------------------------------------------------------------
+// OS Description
+//----------------------------------------------------------------------------
+
+wxString wxGetOsDescription()
+{
+    wxString osname(_T("DOS"));
+    return osname;
+}