Fix typo in last commit

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

diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp
index 15fd47cea381f2f24d5132810d69ef25e46dec64..adf5aab3da68a2a7b1e79ffded61e871b161f2d4 100644 (file)
--- a/src/os2/utils.cpp
+++ b/src/os2/utils.cpp
@@ -1,32 +1,33 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     Various utilities
 // Author:      David Webster
 // Modified by:
 // Created:     09/17/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Purpose:     Various utilities
 // Author:      David Webster
 // Modified by:
 // Created:     09/17/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#include "wx/utils.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/setup.h"
-    #include "wx/utils.h"
-    #include "wx/app.h"
-    #include "wx/cursor.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"

 #endif  //WX_PRECOMP
 
 #include "wx/os2/private.h"
 #endif  //WX_PRECOMP
 
 #include "wx/os2/private.h"

-#include "wx/timer.h"
-#include "wx/intl.h"
+#include "wx/apptrait.h"
+#include "wx/filename.h"

 
 #include <ctype.h>
 
 #include <ctype.h>

-#include <direct.h>
+#ifdef __EMX__
+#include <dirent.h>
+#endif

 
 

-#include "wx/log.h"

 
 #include <io.h>
 
 
 #include <io.h>
 


@@ -36,21 +37,21 @@
 #include <errno.h>
 #include <stdarg.h>
 
 #include <errno.h>
 #include <stdarg.h>
 

-#define INCL_DOS
-#define INCL_PM
-#define INCL_GPI
-#include <os2.h>
-#include<netdb.h>

 #define PURE_32
 #define PURE_32

-#include <upm.h>
-#include <netcons.h>
-#include <netbios.h>

 
 

-// In the WIN.INI file
-static const wxChar WX_SECTION[] = _T("wxWindows");
-static const wxChar eHOSTNAME[]  = _T("HostName");
-static const wxChar eUSERID[]    = _T("UserId");
-static const wxChar eUSERNAME[]  = _T("UserName");
+#if defined(__WATCOMC__)
+extern "C"
+{
+    #include <upm.h>
+}
+#elif !defined(__EMX__)
+    #include <upm.h>
+    #include <netcons.h>
+    #include <netbios.h>
+#endif
+
+static const wxChar WX_SECTION[] = wxT("wxWidgets");
+static const wxChar eHOSTNAME[]  = wxT("HostName");

 
 // For the following functions we SHOULD fill in support
 // for Windows-NT (which I don't know) as I assume it begin
 
 // For the following functions we SHOULD fill in support
 // for Windows-NT (which I don't know) as I assume it begin


@@ -58,574 +59,595 @@ static const wxChar eUSERNAME[]  = _T("UserName");
 // functions beyond those provided by WinSock
 
 // Get full hostname (eg. DoDo.BSn-Germany.crg.de)
 // functions beyond those provided by WinSock
 
 // Get full hostname (eg. DoDo.BSn-Germany.crg.de)

-bool wxGetHostName(wxChar *buf, int maxSize)
-{
-#if wxUSE_NET_API
-  char                               server[256];
-  char                               computer[256];
-  unsigned long                      ulLevel;
-  unsigned char*                     pbBuffer;
-  unsigned long                      ulBuffer;
-  unsigned long*                     pulTotalAvail;
-
-  NetBios32GetInfo( (const unsigned char*)server
-                   ,(const unsigned char*)computer
-                   ,ulLevel
-                   ,pbBuffer
-                   ,ulBuffer
-                   ,pulTotalAvail
-                  );
-  strcpy(buf, server);
+bool wxGetHostName( wxChar* zBuf, int nMaxSize )
+{
+    if (!zBuf) return false;
+
+#if defined(wxUSE_NET_API) && wxUSE_NET_API
+    char           zServer[256];
+    char           zComputer[256];
+    unsigned long  ulLevel = 0;
+    unsigned char* zBuffer = NULL;
+    unsigned long  ulBuffer = 256;
+    unsigned long* pulTotalAvail = NULL;
+
+    NetBios32GetInfo( (const unsigned char*)zServer
+                     ,(const unsigned char*)zComputer
+                     ,ulLevel
+                     ,zBuffer
+                     ,ulBuffer
+                     ,pulTotalAvail
+                    );
+    strcpy(zBuf, zServer);

 #else
 #else

-  wxChar *sysname;
-  const wxChar *default_host = _T("noname");
-
-  if ((sysname = wxGetenv(_T("SYSTEM_NAME"))) == NULL)
-  {
-      // GetProfileString(WX_SECTION, eHOSTNAME, default_host, buf, maxSize - 1);
-  }
-  else
-      wxStrncpy(buf, sysname, maxSize - 1);
-  buf[maxSize] = _T('\0');
+    wxChar*        zSysname;
+    const wxChar*  zDefaultHost = wxT("noname");
+
+    if ((zSysname = wxGetenv(wxT("SYSTEM_NAME"))) == NULL &&
+            (zSysname = wxGetenv(wxT("HOSTNAME"))) == NULL)
+    {
+        ::PrfQueryProfileString( HINI_PROFILE
+                                ,(PSZ)WX_SECTION
+                                ,(PSZ)eHOSTNAME
+                                ,(PSZ)zDefaultHost
+                                ,(void*)zBuf
+                                ,(ULONG)nMaxSize - 1
+                               );
+        zBuf[nMaxSize] = wxT('\0');
+    }
+    else
+    {
+        wxStrlcpy(zBuf, zSysname, nMaxSize);
+    }

 #endif
 #endif

-  return *buf ? TRUE : FALSE;
+
+    return *zBuf ? true : false;

 }
 
 // Get user ID e.g. jacs
 }
 
 // Get user ID e.g. jacs

-bool wxGetUserId(wxChar *buf, int maxSize)
+bool wxGetUserId(wxChar* zBuf, int nType)

 {
 {

-  return(U32ELOCL((unsigned char*)buf, (unsigned long *)&maxSize));
+#if defined(__VISAGECPP__) || defined(__WATCOMC__)
+    // UPM procs return 0 on success
+    long lrc = U32ELOCU((PUCHAR)zBuf, (PULONG)&nType);
+    if (lrc == 0) return true;
+#endif
+    return false;

 }
 
 }
 

-bool wxGetUserName(wxChar *buf, int maxSize)
+bool wxGetUserName( wxChar* zBuf, int nMaxSize )

 {
 #ifdef USE_NET_API
 {
 #ifdef USE_NET_API

-    wxGetUserId(buf, maxSize);
+    wxGetUserId( zBuf, nMaxSize );

 #else
 #else

-    wxStrncpy(buf, _T("Unknown User"), maxSize);
+    wxStrlcpy(zBuf, wxT("Unknown User"), nMaxSize);

 #endif
 #endif

-  return TRUE;
+    return true;

 }
 
 }
 

-int wxKill(long pid, int sig)
+int wxKill(long         lPid,
+           wxSignal     WXUNUSED(eSig),
+           wxKillError* WXUNUSED(peError),
+           int          WXUNUSED(flags))

 {
 {

-  return 0;
+    return((int)::DosKillProcess(0, (PID)lPid));

 }
 
 //
 // Execute a program in an Interactive Shell
 //
 }
 
 //
 // Execute a program in an Interactive Shell
 //

-bool wxShell(const wxString& command)
-{
-  wxChar *shell;
-  if ((shell = wxGetenv(_T("COMSPEC"))) == NULL)
-    shell = _T("\\CMD.EXE");
+bool wxShell( const wxString& rCommand )
+{
+    wxChar*     zShell = wxT("CMD.EXE");
+    wxString    sInputs;
+    STARTDATA   SData = {0};
+    PSZ         PgmTitle = "Command Shell";
+    APIRET      rc;
+    PID         vPid = 0;
+    ULONG       ulSessID = 0;
+    UCHAR       achObjBuf[256] = {0}; //error data if DosStart fails
+    RESULTCODES vResult;
+
+    SData.Length   = sizeof(STARTDATA);
+    SData.Related  = SSF_RELATED_INDEPENDENT;
+    SData.FgBg     = SSF_FGBG_FORE;
+    SData.TraceOpt = SSF_TRACEOPT_NONE;
+    SData.PgmTitle = PgmTitle;
+    SData.PgmName  = (char*)zShell;
+
+    sInputs = wxT("/C ") + rCommand;
+    SData.PgmInputs     = (BYTE*)sInputs.wx_str();
+    SData.TermQ         = 0;
+    SData.Environment   = 0;
+    SData.InheritOpt    = SSF_INHERTOPT_SHELL;
+    SData.SessionType   = SSF_TYPE_WINDOWABLEVIO;
+    SData.IconFile      = 0;
+    SData.PgmHandle     = 0;
+    SData.PgmControl    = SSF_CONTROL_VISIBLE | SSF_CONTROL_MAXIMIZE;
+    SData.InitXPos      = 30;
+    SData.InitYPos      = 40;
+    SData.InitXSize     = 200;
+    SData.InitYSize     = 140;
+    SData.Reserved      = 0;
+    SData.ObjectBuffer  = (char*)achObjBuf;
+    SData.ObjectBuffLen = (ULONG)sizeof(achObjBuf);
+
+    rc = ::DosStartSession(&SData, &ulSessID, &vPid);
+    if (rc == 0 || rc == 457) // NO_ERROR or SMG_START_IN_BACKGROUND
+    {
+        PTIB                            ptib;
+        PPIB                            ppib;

 
 

-  wxChar tmp[255];
-  if (command != "")
-    wxSprintf(tmp, "%s /c %s", shell, WXSTRINGCAST command);
-  else
-    wxStrcpy(tmp, shell);
+        ::DosGetInfoBlocks(&ptib, &ppib);

 
 

-  return (wxExecute((wxChar *)tmp, FALSE) != 0);
+        ::DosWaitChild( DCWA_PROCESS
+                       ,DCWW_WAIT
+                       ,&vResult
+                       ,&ppib->pib_ulpid
+                       ,vPid
+                      );
+    }
+    return (rc != 0);

 }
 
 }
 

-// Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
-long wxGetFreeMemory(void *memptr)
+// Shutdown or reboot the PC
+bool wxShutdown(wxShutdownFlags WXUNUSED(wFlags))

 {
 {

-    ULONG                           lSize;
-    ULONG                           lMemFlags;
-    APIRET                          rc;
-
-    lMemFlags = PAG_FREE;
-    rc = ::DosQueryMem(memptr, &lSize, &lMemFlags);
-    if (rc != 0)
-        return -1L;
-    return (long)lSize;
+    // TODO
+    return false;

 }
 
 }
 

-// Sleep for nSecs seconds. Attempt a Windows implementation using timers.
-static bool inTimer = FALSE;
-
-class wxSleepTimer: public wxTimer
+// Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
+wxMemorySize wxGetFreeMemory()

 {
 {

- public:
-  inline void Notify()
-  {
-    inTimer = FALSE;
-    Stop();
-  }
-};
-
-static wxTimer *wxTheSleepTimer = NULL;
+    void* pMemptr = NULL;
+    LONG  lSize;
+    ULONG lMemFlags;
+    APIRET rc;

 
 

-void wxUsleep(unsigned long milliseconds)
-{
-    ::DosSleep(milliseconds);
+    lMemFlags = PAG_FREE;
+    rc = ::DosQueryMem(pMemptr, (PULONG)&lSize, &lMemFlags);
+    if (rc != 0)
+        lSize = -1L;
+    return (wxMemorySize)lSize;

 }
 
 }
 

-void wxSleep(int nSecs)
+// Get Process ID
+unsigned long wxGetProcessId()

 {
 {

-    ::DosSleep( 1000*nSecs );
+    return (unsigned long)getpid();

 }
 
 }
 

-// Consume all events until no more left
-void wxFlushEvents()
-{
-//  wxYield();
-}
+// ----------------------------------------------------------------------------
+// env vars
+// ----------------------------------------------------------------------------

 
 

-// Output a debug mess., in a system dependent fashion.
-void wxDebugMsg(const wxChar *fmt ...)
+bool wxGetEnv(const wxString& var, wxString *value)

 {
 {

-  va_list ap;
-  static wxChar buffer[512];
-
-  if (!wxTheApp->GetWantDebugOutput())
-    return ;
-
-  va_start(ap, fmt);
+    // wxGetenv is defined as getenv()
+    wxChar *p = wxGetenv((const wxChar *)var);
+    if ( !p )
+        return false;

 
 

-   sprintf(buffer,fmt,ap) ;
+    if ( value )
+    {
+        *value = p;
+    }

 
 

-  va_end(ap);
+    return true;

 }
 
 }
 

-// Non-fatal error: pop up message box and (possibly) continue
-void wxError(const wxString& msg, const wxString& title)
+static bool wxDoSetEnv(const wxString& variable, const char *value)

 {
 {

-  wxSprintf(wxBuffer, "%s\nContinue?", WXSTRINGCAST msg);
-  if (::WinMessageBox( HWND_DESKTOP
-                      ,NULL
-                      ,(PSZ)wxBuffer
-                      ,(PSZ)WXSTRINGCAST title
-                      ,0
-                      ,MB_ICONEXCLAMATION | MB_YESNO
-                     ) == MBID_YES)
-    wxExit();
+#if defined(HAVE_SETENV)
+    if ( !value )
+    {
+#ifdef HAVE_UNSETENV
+        return unsetenv(variable.mb_str()) == 0;
+#else
+        value = wxT(""); // mustn't pass NULL to setenv()
+#endif
+    }
+    return setenv(variable.mb_str(), value, 1 /* overwrite */) == 0;
+#elif defined(HAVE_PUTENV)
+    wxString s = variable;
+    if ( value )
+        s << wxT('=') << value;
+
+    // transform to ANSI
+    const char *p = s.mb_str();
+
+    // the string will be free()d by libc
+    char *buf = (char *)malloc(strlen(p) + 1);
+    strcpy(buf, p);
+
+    return putenv(buf) == 0;
+#else // no way to set an env var
+    wxUnusedVar(variable);
+    wxUnusedVar(value);
+    return false;
+#endif

 }
 
 }
 

-// Fatal error: pop up message box and abort
-void wxFatalError(const wxString& rMsg, const wxString& rTitle)
+bool wxSetEnv(const wxString& variable, const wxString& value)

 {
 {

-    unsigned long                   rc;
-
-    rc = ::WinMessageBox( HWND_DESKTOP
-                         ,NULL
-                         ,WXSTRINGCAST rMsg
-                         ,WXSTRINGCAST rTitle
-                         ,0
-                         ,MB_NOICON | MB_OK
-                        );
-    DosExit(EXIT_PROCESS, rc);
+    return wxDoSetEnv(variable, value.mb_str());

 }
 
 }
 

-// Emit a beeeeeep
-void wxBell()
+bool wxUnsetEnv(const wxString& variable)

 {
 {

-    DosBeep(1000,1000); // 1kHz during 1 sec.
+    return wxDoSetEnv(variable, NULL);

 }
 
 }
 

-// Chris Breeze 27/5/98: revised WIN32 code to
-// detect WindowsNT correctly
-int wxGetOsVersion(int *majorVsn, int *minorVsn)
+void wxMilliSleep(
+  unsigned long                     ulMilliseconds
+)

 {
 {

-  ULONG                 aulSysInfo[QSV_MAX] = {0};
-
-  if (DosQuerySysInfo( 1L
-                      ,QSV_MAX
-                      ,(PVOID)aulSysInfo
-                      ,sizeof(ULONG) * QSV_MAX
-                     ))
-  {
-     *majorVsn = aulSysInfo[QSV_VERSION_MAJOR];
-     *minorVsn = aulSysInfo[QSV_VERSION_MINOR];
-     return wxWINDOWS_OS2;
-  }
-  return wxWINDOWS; // error if we get here, return generic value
+    ::DosSleep(ulMilliseconds);

 }
 
 }
 

-// Reading and writing resources (eg WIN.INI, .Xdefaults)
-// TODO: Ability to read and write to an INI file
-
-#if wxUSE_RESOURCES
-bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file)
+void wxMicroSleep(
+  unsigned long                     ulMicroseconds
+)

 {
 {

-    HAB                             hab;
-    HINI                            hIni;
-
-    if (file != "")
-    {
-        hIni = ::PrfOpenProfile(hab, (PSZ)WXSTRINGCAST file);
-        if (hIni != 0L)
-        {
-            return (::PrfWriteProfileString( hIni
-                                            ,(PSZ)WXSTRINGCAST section
-                                            ,(PSZ)WXSTRINGCAST entry
-                                            ,(PSZ)WXSTRINGCAST value
-                                           ));
-        }
-    }
-    else
-        return (::PrfWriteProfileString( HINI_PROFILE
-                                        ,(PSZ)WXSTRINGCAST section
-                                        ,(PSZ)WXSTRINGCAST entry
-                                        ,(PSZ)WXSTRINGCAST value
-                                       ));
-    return FALSE;
+    ::DosSleep(ulMicroseconds/1000);

 }
 
 }
 

-bool wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file)
+void wxSleep(
+  int                               nSecs
+)

 {
 {

-    wxChar buf[50];
-    wxSprintf(buf, "%.4f", value);
-    return wxWriteResource(section, entry, buf, file);
+    ::DosSleep(1000 * nSecs);

 }
 
 }
 

-bool wxWriteResource(const wxString& section, const wxString& entry, long value, const wxString& file)
+// Consume all events until no more left
+void wxFlushEvents()

 {
 {

-    wxChar buf[50];
-    wxSprintf(buf, "%ld", value);
-    return wxWriteResource(section, entry, buf, file);
+//  wxYield();

 }
 
 }
 

-bool wxWriteResource(const wxString& section, const wxString& entry, int value, const wxString& file)
+// Emit a beeeeeep
+void wxBell()

 {
 {

-    wxChar buf[50];
-    wxSprintf(buf, "%d", value);
-    return wxWriteResource(section, entry, buf, file);
+    DosBeep(1000,1000); // 1kHz during 1 sec.

 }
 
 }
 

-bool wxGetResource(const wxString& section, const wxString& entry, wxChar **value, const wxString& file)
+wxString wxGetOsDescription()

 {
 {

-    HAB                             hab;
-    HINI                            hIni;
-    static const wxChar             defunkt[] = _T("$$default");
+    wxString strVer(wxT("OS/2"));
+    ULONG ulSysInfo = 0;

 
 

-    if (file != "")
+    if (::DosQuerySysInfo( QSV_VERSION_MINOR,
+                           QSV_VERSION_MINOR,
+                           (PVOID)&ulSysInfo,
+                           sizeof(ULONG)
+                         ) == 0L )

     {
     {

-        hIni = ::PrfOpenProfile(hab, (PSZ)WXSTRINGCAST file);
-        if (hIni != 0L)
-        {
-            ULONG n = ::PrfQueryProfileString( hIni
-                                              ,(PSZ)WXSTRINGCAST section
-                                              ,(PSZ)WXSTRINGCAST entry
-                                              ,(PSZ)defunkt
-                                              ,(void*)wxBuffer
-                                              ,1000
-                                             );
-            if (n == 0L || wxStrcmp(wxBuffer, defunkt) == 0)
-                return FALSE;
-        }
-        else
-            return FALSE;
-    }
-    else
-    {
-        ULONG n = ::PrfQueryProfileString( HINI_PROFILE
-                                          ,(PSZ)WXSTRINGCAST section
-                                          ,(PSZ)WXSTRINGCAST entry
-                                          ,(PSZ)defunkt
-                                          ,(void*)wxBuffer
-                                          ,1000
-                                         );
-        if (n == 0L || wxStrcmp(wxBuffer, defunkt) == 0)
-            return FALSE;
+        wxString ver;
+        ver.Printf( wxT(" ver. %d.%d"),
+                    int(ulSysInfo / 10),
+                    int(ulSysInfo % 10)
+                  );
+        strVer += ver;

     }
     }

-    if (*value)
-        delete[] (*value);
-    *value = copystring(wxBuffer);
-    return TRUE;
-}

 
 

-bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file)
-{
-  wxChar *s = NULL;
-  bool succ = wxGetResource(section, entry, (wxChar **)&s, file);
-  if (succ)
-  {
-    *value = (float)wxStrtod(s, NULL);
-    delete[] s;
-    return TRUE;
-  }
-  else return FALSE;
+    return strVer;

 }
 
 }
 

-bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file)
+bool wxIsPlatform64Bit()

 {
 {

-  wxChar *s = NULL;
-  bool succ = wxGetResource(section, entry, (wxChar **)&s, file);
-  if (succ)
-  {
-    *value = wxStrtol(s, NULL, 10);
-    delete[] s;
-    return TRUE;
-  }
-  else return FALSE;
+    // FIXME: No idea how to test for 64 bit processor
+    //        (Probably irrelevant anyhow, though).
+    return false;

 }
 
 }
 

-bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file)
+void wxAppTraits::InitializeGui(unsigned long &WXUNUSED(ulHab))

 {
 {

-  wxChar *s = NULL;
-  bool succ = wxGetResource(section, entry, (wxChar **)&s, file);
-  if (succ)
-  {
-    *value = (int)wxStrtol(s, NULL, 10);
-    delete[] s;
-    return TRUE;
-  }
-  else return FALSE;

 }
 }

-#endif // wxUSE_RESOURCES
-
-// ---------------------------------------------------------------------------
-// helper functions for showing a "busy" cursor
-// ---------------------------------------------------------------------------

 
 

-HCURSOR gs_wxBusyCursor = 0;     // new, busy cursor
-HCURSOR gs_wxBusyCursorOld = 0;  // old cursor
-static int gs_wxBusyCursorCount = 0;
-
-// Set the cursor to the busy cursor for all windows
-void wxBeginBusyCursor(wxCursor *cursor)
+void wxAppTraits::TerminateGui(unsigned long WXUNUSED(ulHab))

 {
 {

-    if ( gs_wxBusyCursorCount++ == 0 )
-    {
-        gs_wxBusyCursor = (HCURSOR)cursor->GetHCURSOR();
-        ::WinSetPointer(HWND_DESKTOP, (HPOINTER)gs_wxBusyCursor);
-    }
-    //else: nothing to do, already set

 }
 
 }
 

-// Restore cursor to normal
-void wxEndBusyCursor()
+wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin)

 {
 {

-    wxCHECK_RET( gs_wxBusyCursorCount > 0,
-                 _T("no matching wxBeginBusyCursor() for wxEndBusyCursor()"));
+    ULONG                 ulSysInfo = 0;
+    APIRET                ulrc;

 
 

-    if ( --gs_wxBusyCursorCount == 0 )
+    ulrc = ::DosQuerySysInfo( QSV_VERSION_MINOR,
+                              QSV_VERSION_MINOR,
+                              (PVOID)&ulSysInfo,
+                              sizeof(ULONG)
+                            );
+
+    if (ulrc == 0L)

     {
     {

-        ::WinSetPointer(HWND_DESKTOP, (HPOINTER)gs_wxBusyCursorOld);
-        gs_wxBusyCursorOld = 0;
+        if ( verMaj )
+            *verMaj = ulSysInfo / 10;
+        if ( verMin )
+            *verMin = ulSysInfo % 10;

     }
     }

-}

 
 

-// TRUE if we're between the above two calls
-bool wxIsBusy()
-{
-  return (gs_wxBusyCursorCount > 0);
+    return wxOS_OS2;

 }
 
 }
 

+

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

-const wxChar* wxGetHomeDir(wxString *pstr)
+const wxChar* wxGetHomeDir(
+  wxString*                         pStr
+)

 {
 {

-  wxString& strDir = *pstr;
+    wxString&                       rStrDir = *pStr;

 
 

-  // OS/2 has no idea about home,
-  // so use the working directory instead?
+    // OS/2 has no idea about home,
+    // so use the working directory instead.
+    // However, we might have a valid HOME directory,
+    // as is used on many machines that have unix utilities
+    // on them, so we should use that, if available.

 
 

-  // 256 was taken from os2def.h
+    // 256 was taken from os2def.h

 #ifndef MAX_PATH
 #  define MAX_PATH  256
 #endif
 
 #ifndef MAX_PATH
 #  define MAX_PATH  256
 #endif
 

+    const wxChar *szHome = wxGetenv((wxChar*)"HOME");
+    if ( szHome == NULL ) {
+      // we're homeless, use current directory.
+      rStrDir = wxT(".");
+    }
+    else
+       rStrDir = szHome;

 
 

-    char     DirName[256];
-    ULONG    DirLen;
-
-    ::DosQueryCurrentDir( 0, DirName, &DirLen);
-    strDir = DirName;
-  return strDir.c_str();
+    return rStrDir.c_str();

 }
 
 }
 

-// Hack for MS-DOS
-wxChar *wxGetUserHome (const wxString& user)
+wxString wxGetUserHome ( const wxString &rUser )

 {
 {

-  wxChar *home;
-  wxString user1(user);
-
-  if (user1 != _T("")) {
-    wxChar tmp[64];
-    if (wxGetUserId(tmp, sizeof(tmp)/sizeof(char))) {
-      // Guests belong in the temp dir
-      if (wxStricmp(tmp, _T("annonymous")) == 0) {
-        if ((home = wxGetenv(_T("TMP"))) != NULL ||
-            (home = wxGetenv(_T("TMPDIR"))) != NULL ||
-            (home = wxGetenv(_T("TEMP"))) != NULL)
-            return *home ? home : (wxChar*)_T("\\");
-      }
-      if (wxStricmp(tmp, WXSTRINGCAST user1) == 0)
-        user1 = _T("");
-    }
-  }
-  if (user1 == _T(""))
-    if ((home = wxGetenv(_T("HOME"))) != NULL)
+    wxChar*    zHome;
+    wxString   sUser(rUser);
+
+    wxString home;
+
+#ifndef __EMX__
+    if (!sUser.empty())

     {
     {

-      wxStrcpy(wxBuffer, home);
-      Unix2DosFilename(wxBuffer);
-      return wxBuffer;
-    }
-  return NULL; // No home known!
-}
+        const wxString currentUser = wxGetUserId();

 
 

-// Check whether this window wants to process messages, e.g. Stop button
-// in long calculations.
-bool wxCheckForInterrupt(wxWindow *wnd)
-{
-  if(wnd){
-    QMSG            msg;
-    HAB             hab;
-    HWND            hwndFilter;
+        // Guests belong in the temp dir
+        if ( currentUser == "annonymous" )
+        {
+            zHome = wxGetenv(wxT("TMP"));
+            if ( !zHome )
+                zHome = wxGetenv(wxT("TMPDIR"));
+            if ( !zHome )
+                zHome = wxGetenv(wxT("TEMP"));
+
+            if ( zHome && *zHome )
+                return zHome;
+        }

 
 

-    HWND win= (HWND) wnd->GetHWND();
-    while(::WinPeekMsg(hab,&msg,hwndFilter,0,0,PM_REMOVE))
+        if ( sUser == currentUser )
+            sUser.clear();
+    }
+#endif
+    if (sUser.empty())

     {
     {

-      ::WinDispatchMsg( hab, &msg );
+        if ((zHome = wxGetenv(wxT("HOME"))) != NULL)
+        {
+            home = zHome;
+            home.Replace("/", "\\");
+        }

     }
     }

-    return TRUE;//*** temporary?
-  }
-  else{
-    wxFAIL_MSG(_T("wnd==NULL !!!"));

 
 

-    return FALSE;//*** temporary?
-  }
+    return home;

 }
 
 }
 

-wxChar *wxLoadUserResource(const wxString& resourceName, const wxString& resourceType)
+bool wxGetDiskSpace(const wxString& path,
+                    wxDiskspaceSize_t *pTotal,
+                    wxDiskspaceSize_t *pFree)

 {
 {

-  wxChar *s = NULL;
-
-/*
-*  How to in PM?
-*
-* #if !defined(__WIN32__) || defined(__TWIN32__)
-*   HRSRC hResource = ::FindResource(wxGetInstance(), WXSTRINGCAST resourceName, WXSTRINGCAST resourceType);
-* #else
-* #ifdef UNICODE
-*   HRSRC hResource = ::FindResourceW(wxGetInstance(), WXSTRINGCAST resourceName, WXSTRINGCAST resourceType);
-* #else
-*   HRSRC hResource = ::FindResourceA(wxGetInstance(), WXSTRINGCAST resourceName, WXSTRINGCAST resourceType);
-* #endif
-* #endif
-*
-*   if (hResource == 0)
-*     return NULL;
-*   HGLOBAL hData = ::LoadResource(wxGetInstance(), hResource);
-*   if (hData == 0)
-*     return NULL;
-*   wxChar *theText = (wxChar *)LockResource(hData);
-*   if (!theText)
-*     return NULL;
-*
-* s = copystring(theText);
-*/
-  return s;
-}
+    if (path.empty())
+        return false;

 
 

-void wxGetMousePosition( int* x, int* y )
-{
-    POINTL pt;
-    ::WinQueryPointerPos( HWND_DESKTOP, & pt );
-    *x = pt.x;
-    *y = pt.y;
-};
-
-// Return TRUE if we have a colour display
-bool wxColourDisplay()
-{
-    bool flag;
-    // TODO:  use DosQueryDevCaps to figure it out
-    return flag;
-}
+    wxFileName fn(path);
+    FSALLOCATE fsaBuf = {0};
+    APIRET rc = NO_ERROR;
+    ULONG disknum = 0;

 
 

-// Returns depth of screen
-int wxDisplayDepth()
-{
-    HDC                             hDc = ::WinOpenWindowDC((HWND)NULL);
-    long                            lArray[CAPS_COLOR_BITCOUNT];
-    int                             nPlanes;
-    int                             nBitsPerPixel;
-    int                             nDepth;
-
-    if(DevQueryCaps( hDc
-                    ,CAPS_FAMILY
-                    ,CAPS_COLOR_BITCOUNT
-                    ,lArray
-                   ))
+    fn.MakeAbsolute();
+
+    if (wxDirExists(fn.GetFullPath()) == false)
+        return false;
+
+    disknum = wxToupper(fn.GetVolume().GetChar(0)) - wxT('A') + 1;
+
+    rc = ::DosQueryFSInfo(disknum,             // 1 = A, 2 = B, 3 = C, ...
+                          FSIL_ALLOC,          // allocation info
+                          (PVOID)&fsaBuf,
+                          sizeof(FSALLOCATE));
+
+    if (rc != NO_ERROR)
+        return false;
+    else

     {
     {

-        nPlanes = (int)lArray[CAPS_COLOR_PLANES];
-        nBitsPerPixel = (int)lArray[CAPS_COLOR_BITCOUNT];
-        nDepth = nPlanes * nBitsPerPixel;
+        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;

     }
     }

-    DevCloseDC(hDc);
-    return (nDepth);

 }
 
 }
 

-// Get size of display
-void wxDisplaySize(int *width, int *height)
+wxString wxPMErrorToStr(ERRORID vError)

 {
 {

-    HDC                             hDc = ::WinOpenWindowDC((HWND)NULL);
-    long                            lArray[CAPS_HEIGHT];
-
-    if(DevQueryCaps( hDc
-                    ,CAPS_FAMILY
-                    ,CAPS_HEIGHT
-                    ,lArray
-                   ))
+    wxString sError;
+
+    //
+    // Remove the high order byte -- it is useless
+    //
+    vError &= 0x0000ffff;
+    switch(vError)

     {
     {

-        *width  = (int)lArray[CAPS_WIDTH];
-        *height = (int)lArray[CAPS_HEIGHT];
-    }
-    DevCloseDC(hDc);
-}
+        case PMERR_INVALID_HWND:
+            sError = wxT("Invalid window handle specified");
+            break;

 
 

-bool wxDirExists(const wxString& dir)
-{
-   // TODO:  Control program file stuff
-   return TRUE;
-}
+        case PMERR_INVALID_FLAG:
+            sError = wxT("Invalid flag bit set");
+            break;

 
 

-// ---------------------------------------------------------------------------
-// window information functions
-// ---------------------------------------------------------------------------
+        case PMERR_NO_MSG_QUEUE:
+            sError = wxT("No message queue available");
+            break;

 
 

-wxString WXDLLEXPORT wxGetWindowText(WXHWND hWnd)
-{
-    wxString str;
-    long len = ::WinQueryWindowTextLength((HWND)hWnd) + 1;
-    ::WinQueryWindowText((HWND)hWnd, len, str.GetWriteBuf((int)len));
-    str.UngetWriteBuf();
+        case PMERR_INVALID_PARM:
+            sError = wxT("Parameter contained invalid data");
+            break;

 
 

-    return str;
-}
+        case PMERR_INVALID_PARAMETERS:
+            sError = wxT("Parameter value is out of range");
+            break;

 
 

-wxString WXDLLEXPORT wxGetWindowClass(WXHWND hWnd)
-{
-    wxString str;
+        case PMERR_PARAMETER_OUT_OF_RANGE:
+            sError = wxT("Parameter value is out of range");
+            break;

 
 

-    int len = 256; // some starting value
+        case PMERR_INVALID_INTEGER_ATOM:
+            sError = wxT("Not a valid atom");
+            break;

 
 

-    for ( ;; )
-    {
-        int count = ::WinQueryClassName((HWND)hWnd, len, str.GetWriteBuf(len));
+        case PMERR_INVALID_HATOMTBL:
+            sError = wxT("Atom table handle is invalid");
+            break;

 
 

-        str.UngetWriteBuf();
-        if ( count == len )
-        {
-            // the class name might have been truncated, retry with larger
-            // buffer
-            len *= 2;
-        }
-        else
-        {
+        case PMERR_INVALID_ATOM_NAME:
+            sError = wxT("Not a valid atom name");

             break;
             break;

-        }
+
+        case PMERR_ATOM_NAME_NOT_FOUND:
+            sError = wxT("Valid name format, but cannot find name in atom table");
+            break;
+
+        case PMERR_INV_HPS:
+            sError = wxT("PMERR_INV_HPS");
+            break;
+
+        case PMERR_PS_BUSY:
+            sError = wxT("PMERR_PS_BUSY");
+            break;
+
+        case PMERR_INV_PRIMITIVE_TYPE:
+            sError = wxT("PMERR_INV_PRIMITIVE_TYPE");
+            break;
+
+        case PMERR_UNSUPPORTED_ATTR:
+            sError = wxT("PMERR_UNSUPPORTED_ATTR");
+            break;
+
+        case PMERR_INV_COLOR_ATTR:
+            sError = wxT("PMERR_INV_COLOR_ATTR");
+            break;
+
+        case PMERR_INV_BACKGROUND_COL_ATTR:
+            sError = wxT("PMERR_INV_BACKGROUND_COL_ATTR");
+            break;
+
+        case PMERR_INV_MIX_ATTR:
+            sError = wxT("PMERR_INV_MIX_ATTR");
+            break;
+
+        case PMERR_INV_LINE_WIDTH_ATTR:
+            sError = wxT("PMERR_INV_LINE_WIDTH_ATTR");
+            break;
+
+        case PMERR_INV_GEOM_LINE_WIDTH_ATTR:
+            sError = wxT("PMERR_INV_GEOM_LINE_WIDTH_ATTR");
+            break;
+
+        case PMERR_INV_LINE_TYPE_ATTR:
+            sError = wxT("PMERR_INV_LINE_TYPE_ATTR");
+            break;
+
+        case PMERR_INV_LINE_END_ATTR:
+            sError = wxT("PMERR_INV_LINE_END_ATTR");
+            break;
+
+        case PMERR_INV_LINE_JOIN_ATTR:
+            sError = wxT("PMERR_INV_LINE_JOIN_ATTR");
+            break;
+
+        case PMERR_INV_CHAR_SET_ATTR:
+            sError = wxT("PMERR_INV_CHAR_SET_ATTR");
+            break;
+
+        case PMERR_INV_CHAR_MODE_ATTR:
+            sError = wxT("PMERR_INV_CHAR_MODE_ATTR");
+            break;
+
+        case PMERR_INV_CHAR_DIRECTION_ATTR:
+            sError = wxT("PMERR_INV_CHAR_DIRECTION_ATTR");
+            break;
+
+        case PMERR_INV_CHAR_SHEAR_ATTR:
+            sError = wxT("PMERR_INV_CHAR_SHEAR_ATTR");
+            break;
+
+        case PMERR_INV_CHAR_ANGLE_ATTR:
+            sError = wxT("PMERR_INV_CHAR_ANGLE_ATTR");
+            break;
+
+        case PMERR_INV_MARKER_SET_ATTR:
+            sError = wxT("PMERR_INV_MARKER_SET_ATTR");
+            break;
+
+        case PMERR_INV_MARKER_SYMBOL_ATTR:
+            sError = wxT("PMERR_INV_MARKER_SYMBOL_ATTR");
+            break;
+
+        case PMERR_INV_PATTERN_SET_ATTR:
+            sError = wxT("PMERR_INV_PATTERN_SET_ATTR");
+            break;
+
+        case PMERR_INV_PATTERN_ATTR:
+            sError = wxT("PMERR_INV_PATTERN_ATTR");
+            break;
+
+        case PMERR_INV_COORDINATE:
+            sError = wxT("PMERR_INV_COORDINATE");
+            break;
+
+        case PMERR_UNSUPPORTED_ATTR_VALUE:
+            sError = wxT("PMERR_UNSUPPORTED_ATTR_VALUE");
+            break;
+
+        case PMERR_INV_PATTERN_SET_FONT:
+            sError = wxT("PMERR_INV_PATTERN_SET_FONT");
+            break;
+
+        case PMERR_HUGE_FONTS_NOT_SUPPORTED:
+            sError = wxT("PMERR_HUGE_FONTS_NOT_SUPPORTED");
+            break;
+
+        default:
+            sError = wxT("Unknown error");

     }
     }

-    return str;
-}
+    return sError;
+} // end of wxPMErrorToStr

 
 

-WXWORD WXDLLEXPORT wxGetWindowId(WXHWND hWnd)
+// replacement for implementation in unix/utilsunx.cpp,
+// to be used by all X11 based ports.
+struct wxEndProcessData;
+
+void wxHandleProcessTermination(wxEndProcessData *WXUNUSED(proc_data))

 {
 {

-    return ::WinQueryWindowUShort((HWND)hWnd, QWS_ID);
+    // For now, just do nothing. To be filled in as needed.

 }
 }

-