corrected WX_DEFINE_VARARG_FUNC_NOP usage

[wxWidgets.git] / src / os2 / utils.cpp

diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp
index 02f775d5fdeabc0fd20896ad77a15465ad2b44c8..cc0812db2776897d297bd30b2b6ce2c5af283a55 100644 (file)
--- a/src/os2/utils.cpp
+++ b/src/os2/utils.cpp
@@ -15,13 +15,13 @@
 #include "wx/utils.h"
 
 #ifndef WX_PRECOMP
 #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/intl.h"
     #include "wx/log.h"
 #endif  //WX_PRECOMP
 
 #include "wx/os2/private.h"
 #include "wx/apptrait.h"

+#include "wx/filename.h"

 
 #include <ctype.h>
 #ifdef __EMX__
 
 #include <ctype.h>
 #ifdef __EMX__


@@ -83,7 +83,8 @@ bool wxGetHostName( wxChar* zBuf, int nMaxSize )
     wxChar*        zSysname;
     const wxChar*  zDefaultHost = _T("noname");
 
     wxChar*        zSysname;
     const wxChar*  zDefaultHost = _T("noname");
 

-    if ((zSysname = wxGetenv(_T("SYSTEM_NAME"))) == NULL)
+    if ((zSysname = wxGetenv(_T("SYSTEM_NAME"))) == NULL &&
+       (zSysname = wxGetenv(_T("HOSTNAME"))) == NULL)

     {
         ::PrfQueryProfileString( HINI_PROFILE
                                 ,(PSZ)WX_SECTION
     {
         ::PrfQueryProfileString( HINI_PROFILE
                                 ,(PSZ)WX_SECTION


@@ -298,19 +299,18 @@ void wxBell()
 wxString wxGetOsDescription()
 {
     wxString strVer(_T("OS/2"));
 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;
                          ) == 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;
     }
                   );
         strVer += ver;
     }


@@ -318,6 +318,13 @@ wxString wxGetOsDescription()
     return strVer;
 }
 
     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))
 {
 }
 void wxAppTraits::InitializeGui(unsigned long &WXUNUSED(ulHab))
 {
 }


@@ -326,27 +333,29 @@ void wxAppTraits::TerminateGui(unsigned long WXUNUSED(ulHab))
 {
 }
 
 {
 }
 

-wxToolkitInfo & wxConsoleAppTraits::GetToolkitInfo()
+wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin)

 {
 {

-    static wxToolkitInfo  vInfo;
-    ULONG                 ulSysInfo[QSV_MAX] = {0};
+    ULONG                 ulSysInfo = 0;

     APIRET                ulrc;
 
     APIRET                ulrc;
 

-    vInfo.name = _T("wxBase");
-    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 (ulrc == 0L)
     {

-        vInfo.versionMajor = ulSysInfo[QSV_VERSION_MAJOR] / 10;
-        vInfo.versionMinor = ulSysInfo[QSV_VERSION_MINOR];
+        if ( verMaj )
+            *verMaj = ulSysInfo / 10;
+        if ( verMin )
+            *verMin = ulSysInfo % 10;

     }
     }

-    vInfo.os = wxOS2_PM;
-    return vInfo;
+
+    return wxOS_OS2;

 }
 
 }
 

+

 // ---------------------------------------------------------------------------
 const wxChar* wxGetHomeDir(
   wxString*                         pStr
 // ---------------------------------------------------------------------------
 const wxChar* wxGetHomeDir(
   wxString*                         pStr


@@ -431,6 +440,51 @@ wxChar* wxGetUserHome ( const wxString &rUser )
     return (wxChar*)wxEmptyString; // No home known!
 }
 
     return (wxChar*)wxEmptyString; // No home known!
 }
 

+bool wxGetDiskSpace(const wxString& path,
+                    wxDiskspaceSize_t *pTotal,
+                    wxDiskspaceSize_t *pFree)
+{
+    if (path.empty())
+        return false;
+
+    wxFileName fn(path);
+    FSALLOCATE fsaBuf = {0};
+    APIRET rc = NO_ERROR;
+    ULONG disknum = 0;
+
+    fn.MakeAbsolute();
+
+    if (wxDirExists(fn.GetFullPath()) == false)
+        return false;
+
+    disknum = 1 + wxToupper(fn.GetVolume().GetChar(0)) - _T('A');
+
+    rc = ::DosQueryFSInfo(disknum,             // 1 = A, 2 = B, 3 = C, ...
+                          FSIL_ALLOC,          // allocation info
+                          (PVOID)&fsaBuf,
+                          sizeof(FSALLOCATE));
+
+    if (rc != NO_ERROR)
+        return false;
+    else
+    {
+        if(pTotal)
+        {
+           // to try to avoid 32-bit overflow, let's not multiply right away
+            // (num of alloc units)
+            *pTotal = fsaBuf.cUnit;  
+            // * (num of sectors per alloc unit) * (num of bytes per sector)
+            (*pTotal) *= fsaBuf.cSectorUnit * fsaBuf.cbSector;
+        }
+        if(pFree)
+        {
+            *pFree = fsaBuf.cUnitAvail;
+            (*pFree) *= fsaBuf.cSectorUnit * fsaBuf.cbSector;
+        }
+        return true;
+    }
+}
+ 

 wxString wxPMErrorToStr(ERRORID vError)
 {
     wxString sError;
 wxString wxPMErrorToStr(ERRORID vError)
 {
     wxString sError;