X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/91a3623fc32f7a2550ee0b187ce21d1376119508..4627af27d499cd8aca708ca06e8fad19dd61ca26:/src/os2/utils.cpp?ds=sidebyside

diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp
index 7509ab5766..33d262725b 100644
--- a/src/os2/utils.cpp
+++ b/src/os2/utils.cpp
@@ -15,14 +15,12 @@
 #include "wx/utils.h"
 
 #ifndef WX_PRECOMP
-    #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
 #endif  //WX_PRECOMP
 
 #include "wx/os2/private.h"
 #include "wx/apptrait.h"
-#include "wx/platinfo.h"
 
 #include <ctype.h>
 #ifdef __EMX__
@@ -299,19 +297,18 @@ void wxBell()
 wxString wxGetOsDescription()
 {
     wxString strVer(_T("OS/2"));
-    ULONG ulSysInfo[QSV_MAX] = {0};
+    ULONG ulSysInfo = 0;
 
-    if (::DosQuerySysInfo( 1L,
-                           QSV_MAX,
-                           (PVOID)ulSysInfo,
-                           sizeof(ULONG) * QSV_MAX
+    if (::DosQuerySysInfo( QSV_VERSION_MINOR,
+                           QSV_VERSION_MINOR,
+                           (PVOID)&ulSysInfo,
+                           sizeof(ULONG)
                          ) == 0L )
     {
         wxString ver;
-        ver.Printf( _T(" ver. %d.%d rev. %c"),
-                    int(ulSysInfo[QSV_VERSION_MAJOR] / 10),
-                    int(ulSysInfo[QSV_VERSION_MINOR]),
-                    char(ulSysInfo[QSV_VERSION_REVISION])
+        ver.Printf( _T(" ver. %d.%d"),
+                    int(ulSysInfo / 10),
+                    int(ulSysInfo % 10)
                   );
         strVer += ver;
     }
@@ -319,6 +316,13 @@ wxString wxGetOsDescription()
     return strVer;
 }
 
+bool wxIsPlatform64Bit()
+{
+    // FIXME: No idea how to test for 64 bit processor
+    //        (Probably irrelevant anyhow, though).
+    return false;
+}
+
 void wxAppTraits::InitializeGui(unsigned long &WXUNUSED(ulHab))
 {
 }
@@ -329,22 +333,21 @@ void wxAppTraits::TerminateGui(unsigned long WXUNUSED(ulHab))
 
 wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin)
 {
-    static wxToolkitInfo  vInfo;
-    ULONG                 ulSysInfo[QSV_MAX] = {0};
+    ULONG                 ulSysInfo = 0;
     APIRET                ulrc;
 
-    ulrc = ::DosQuerySysInfo( 1L
-                             ,QSV_MAX
-                             ,(PVOID)ulSysInfo
-                             ,sizeof(ULONG) * QSV_MAX
+    ulrc = ::DosQuerySysInfo( QSV_VERSION_MINOR,
+                              QSV_VERSION_MINOR,
+                              (PVOID)&ulSysInfo,
+                              sizeof(ULONG)
                             );
 
     if (ulrc == 0L)
     {
         if ( verMaj )
-            *verMaj = ulSysInfo[QSV_VERSION_MAJOR] / 10;
+            *verMaj = ulSysInfo / 10;
         if ( verMin )
-            *verMin = ulSysInfo[QSV_VERSION_MINOR];
+            *verMin = ulSysInfo % 10;
     }
 
     return wxOS_OS2;