switching to newer API

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

diff --git a/src/msdos/utilsdos.cpp b/src/msdos/utilsdos.cpp
index 2507bc711ca0586b4a4f9f07c850c732ddfaf6f9..6bbd0de3f227bc59f6c22339c9dbe3839c459b0c 100644 (file)
--- a/src/msdos/utilsdos.cpp
+++ b/src/msdos/utilsdos.cpp
@@ -21,12 +21,12 @@
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/app.h"

 #endif
 
 #include "wx/apptrait.h"
 #include "wx/process.h"
 #include "wx/confbase.h"        // for wxExpandEnvVars()
 #endif
 
 #include "wx/apptrait.h"
 #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"


@@ -329,7 +329,7 @@ public:
         : wxFFileInputStream(name, _T("rt"))
     { }
 
         : wxFFileInputStream(name, _T("rt"))
     { }
 

-    ~wxTempFileInStream()
+    virtual ~wxTempFileInStream()

     {
         m_file->Close();
         wxRemoveFile(m_file->GetName());
     {
         m_file->Close();
         wxRemoveFile(m_file->GetName());


@@ -467,22 +467,9 @@ long wxExecute(wxChar **argv, int flags, wxProcess *process)
     return result;
 }
 
     return result;
 }
 

-//----------------------------------------------------------------------------
-// Traits for console apps
-//----------------------------------------------------------------------------
-
-wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()
-{
-    static wxToolkitInfo info;
-    info.versionMajor = _osmajor;
-    info.versionMinor = _osminor;
-    info.name = _T("wxBase");
-    info.os = wxDOS;
-    return info;
-}

 
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------

-// OS Description
+// OS-related

 //----------------------------------------------------------------------------
 
 wxString wxGetOsDescription()
 //----------------------------------------------------------------------------
 
 wxString wxGetOsDescription()


@@ -490,3 +477,19 @@ wxString wxGetOsDescription()
     wxString osname(_T("DOS"));
     return osname;
 }
     wxString osname(_T("DOS"));
     return osname;
 }

+
+wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin)
+{
+    if ( verMaj )
+        *verMaj = _osmajor;
+    if ( verMin )
+        *verMin = _osminor;
+
+    return wxOS_DOS;
+}
+
+bool wxIsPlatform64Bit()
+{
+    return false;
+}
+