fixes #14318

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

diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp
index 622673e7f9ea062e6f818c680b824c1dfe75201a..adf5aab3da68a2a7b1e79ffded61e871b161f2d4 100644 (file)
--- a/src/os2/utils.cpp
+++ b/src/os2/utils.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     Various utilities
 // Author:      David Webster
 // Modified by:
 // Purpose:     Various utilities
 // Author:      David Webster
 // Modified by:


@@ -12,22 +12,22 @@
 // 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/intl.h"
+    #include "wx/log.h"

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

-#include "wx/intl.h"

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

+#include "wx/filename.h"

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

-#include "wx/log.h"

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


@@ -39,16 +39,19 @@
 
 #define PURE_32
 
 
 #define PURE_32
 

-#ifndef __EMX__
-#include <upm.h>
-#include <netcons.h>
-#include <netbios.h>
+#if defined(__WATCOMC__)
+extern "C"
+{
+    #include <upm.h>
+}
+#elif !defined(__EMX__)
+    #include <upm.h>
+    #include <netcons.h>
+    #include <netbios.h>

 #endif
 
 #endif
 

-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");
+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


@@ -56,18 +59,17 @@ 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*                           zBuf
-, int                               nMaxSize
-)
+bool wxGetHostName( wxChar* zBuf, int nMaxSize )

 {
 {

-#if 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;
+    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
 
     NetBios32GetInfo( (const unsigned char*)zServer
                      ,(const unsigned char*)zComputer


@@ -78,10 +80,11 @@ bool wxGetHostName(
                     );
     strcpy(zBuf, zServer);
 #else
                     );
     strcpy(zBuf, zServer);
 #else

-    wxChar*                         zSysname;
-    const wxChar*                   zDefaultHost = _T("noname");
+    wxChar*        zSysname;
+    const wxChar*  zDefaultHost = wxT("noname");

 
 

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

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


@@ -90,49 +93,42 @@ bool wxGetHostName(
                                 ,(void*)zBuf
                                 ,(ULONG)nMaxSize - 1
                                );
                                 ,(void*)zBuf
                                 ,(ULONG)nMaxSize - 1
                                );

+        zBuf[nMaxSize] = wxT('\0');

     }
     else
     }
     else

-        wxStrncpy(zBuf, zSysname, nMaxSize - 1);
-    zBuf[nMaxSize] = _T('\0');
+    {
+        wxStrlcpy(zBuf, zSysname, nMaxSize);
+    }

 #endif
 #endif

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

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

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

 {
 {

-#if defined(__VISAGECPP__)
-    long                            lrc;
+#if defined(__VISAGECPP__) || defined(__WATCOMC__)

     // UPM procs return 0 on success
     // UPM procs return 0 on success

-    lrc = U32ELOCU((unsigned char*)zBuf, (unsigned long *)&nType);
-    if (lrc == 0) return TRUE;
+    long lrc = U32ELOCU((PUCHAR)zBuf, (PULONG)&nType);
+    if (lrc == 0) return true;

 #endif
 #endif

-    return FALSE;
+    return false;

 }
 
 }
 

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

 {
 #ifdef USE_NET_API
 {
 #ifdef USE_NET_API

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

 #else
 #else

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

 #endif
 #endif

-    return TRUE;
+    return true;

 }
 
 }
 

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

 {
     return((int)::DosKillProcess(0, (PID)lPid));
 }
 {
     return((int)::DosKillProcess(0, (PID)lPid));
 }


@@ -140,29 +136,27 @@ int wxKill(
 //
 // Execute a program in an Interactive Shell
 //
 //
 // Execute a program in an Interactive Shell
 //

-bool wxShell(
-  const wxString&                   rCommand
-)
+bool wxShell( const wxString& rCommand )

 {
 {

-    wxChar*                         zShell = _T("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;
+    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.Length   = sizeof(STARTDATA);
     SData.Related  = SSF_RELATED_INDEPENDENT;
     SData.FgBg     = SSF_FGBG_FORE;
     SData.TraceOpt = SSF_TRACEOPT_NONE;
     SData.PgmTitle = PgmTitle;

-    SData.PgmName  = zShell;
+    SData.PgmName  = (char*)zShell;

 
 

-    sInputs = "/C " + rCommand;
-    SData.PgmInputs     = (BYTE*)sInputs.c_str();
+    sInputs = wxT("/C ") + rCommand;
+    SData.PgmInputs     = (BYTE*)sInputs.wx_str();

     SData.TermQ         = 0;
     SData.Environment   = 0;
     SData.InheritOpt    = SSF_INHERTOPT_SHELL;
     SData.TermQ         = 0;
     SData.Environment   = 0;
     SData.InheritOpt    = SSF_INHERTOPT_SHELL;


@@ -197,25 +191,31 @@ bool wxShell(
 }
 
 // Shutdown or reboot the PC
 }
 
 // Shutdown or reboot the PC

-bool wxShutdown(wxShutdownFlags wFlags)
+bool wxShutdown(wxShutdownFlags WXUNUSED(wFlags))

 {
     // TODO
 {
     // TODO

-    return FALSE;
+    return false;

 }
 
 // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
 }
 
 // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)

-long wxGetFreeMemory()
+wxMemorySize wxGetFreeMemory()

 {
 {

-    void*                           pMemptr = NULL;
-    ULONG                           lSize;
-    ULONG                           lMemFlags;
-    APIRET                          rc;
+    void* pMemptr = NULL;
+    LONG  lSize;
+    ULONG lMemFlags;
+    APIRET rc;

 
     lMemFlags = PAG_FREE;
 
     lMemFlags = PAG_FREE;

-    rc = ::DosQueryMem(pMemptr, &lSize, &lMemFlags);
+    rc = ::DosQueryMem(pMemptr, (PULONG)&lSize, &lMemFlags);

     if (rc != 0)
     if (rc != 0)

-        return -1L;
-    return (long)lSize;
+        lSize = -1L;
+    return (wxMemorySize)lSize;
+}
+
+// Get Process ID
+unsigned long wxGetProcessId()
+{
+    return (unsigned long)getpid();

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -225,27 +225,34 @@ long wxGetFreeMemory()
 bool wxGetEnv(const wxString& var, wxString *value)
 {
     // wxGetenv is defined as getenv()
 bool wxGetEnv(const wxString& var, wxString *value)
 {
     // wxGetenv is defined as getenv()

-    wxChar *p = wxGetenv(var);
+    wxChar *p = wxGetenv((const wxChar *)var);

     if ( !p )
     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)
+static bool wxDoSetEnv(const wxString& variable, const char *value)

 {
 #if defined(HAVE_SETENV)
 {
 #if defined(HAVE_SETENV)

-    return setenv(variable.mb_str(), value ? wxString(value).mb_str().data()
-                                           : NULL, 1 /* overwrite */) == 0;
+    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 )
 #elif defined(HAVE_PUTENV)
     wxString s = variable;
     if ( value )

-        s << _T('=') << value;
+        s << wxT('=') << value;

 
     // transform to ANSI
     const char *p = s.mb_str();
 
     // transform to ANSI
     const char *p = s.mb_str();


@@ -256,17 +263,36 @@ bool wxSetEnv(const wxString& variable, const wxChar *value)
 
     return putenv(buf) == 0;
 #else // no way to set an env var
 
     return putenv(buf) == 0;
 #else // no way to set an env var

-    return FALSE;
+    wxUnusedVar(variable);
+    wxUnusedVar(value);
+    return false;

 #endif
 }
 
 #endif
 }
 

-void wxUsleep(
+bool wxSetEnv(const wxString& variable, const wxString& value)
+{
+    return wxDoSetEnv(variable, value.mb_str());
+}
+
+bool wxUnsetEnv(const wxString& variable)
+{
+    return wxDoSetEnv(variable, NULL);
+}
+
+void wxMilliSleep(

   unsigned long                     ulMilliseconds
 )
 {
     ::DosSleep(ulMilliseconds);
 }
 
   unsigned long                     ulMilliseconds
 )
 {
     ::DosSleep(ulMilliseconds);
 }
 

+void wxMicroSleep(
+  unsigned long                     ulMicroseconds
+)
+{
+    ::DosSleep(ulMicroseconds/1000);
+}
+

 void wxSleep(
   int                               nSecs
 )
 void wxSleep(
   int                               nSecs
 )


@@ -280,98 +306,72 @@ void wxFlushEvents()
 //  wxYield();
 }
 
 //  wxYield();
 }
 

-#if WXWIN_COMPATIBILITY_2_2
-
-// Output a debug mess., in a system dependent fashion.
-void wxDebugMsg(
-  const wxChar*                     zFmt ...
-)
+// Emit a beeeeeep
+void wxBell()

 {
 {

-    va_list                         vAp;
-    static wxChar                   zBuffer[512];
-
-    if (!wxTheApp->GetWantDebugOutput())
-        return ;
-    va_start(vAp, zFmt);
-    sprintf(zBuffer, zFmt, vAp) ;
-    va_end(vAp);
+    DosBeep(1000,1000); // 1kHz during 1 sec.

 }
 
 }
 

-// Non-fatal error: pop up message box and (possibly) continue
-void wxError(
-  const wxString&                   rMsg
-, const wxString&                   rTitle
-)
+wxString wxGetOsDescription()

 {
 {

-    wxBuffer = new wxChar[256];
-    wxSprintf(wxBuffer, "%s\nContinue?", WXSTRINGCAST rMsg);
-    if (::WinMessageBox( HWND_DESKTOP
-                        ,NULL
-                        ,(PSZ)wxBuffer
-                        ,(PSZ)WXSTRINGCAST rTitle
-                        ,0
-                        ,MB_ICONEXCLAMATION | MB_YESNO
-                       ) == MBID_YES)
-    delete[] wxBuffer;
-    wxExit();
-}
+    wxString strVer(wxT("OS/2"));
+    ULONG ulSysInfo = 0;
+
+    if (::DosQuerySysInfo( QSV_VERSION_MINOR,
+                           QSV_VERSION_MINOR,
+                           (PVOID)&ulSysInfo,
+                           sizeof(ULONG)
+                         ) == 0L )
+    {
+        wxString ver;
+        ver.Printf( wxT(" ver. %d.%d"),
+                    int(ulSysInfo / 10),
+                    int(ulSysInfo % 10)
+                  );
+        strVer += ver;
+    }

 
 

-// Fatal error: pop up message box and abort
-void wxFatalError(
-  const wxString&                   rMsg
-, const wxString&                   rTitle
-)
-{
-    unsigned long                   ulRc;
-
-    ulRc = ::WinMessageBox( HWND_DESKTOP
-                           ,NULL
-                           ,WXSTRINGCAST rMsg
-                           ,WXSTRINGCAST rTitle
-                           ,0
-                           ,MB_NOICON | MB_OK
-                          );
-    DosExit(EXIT_PROCESS, ulRc);
+    return strVer;

 }
 
 }
 

-#endif // WXWIN_COMPATIBILITY_2_2
-
-// Emit a beeeeeep
-void wxBell()
+bool wxIsPlatform64Bit()

 {
 {

-    DosBeep(1000,1000); // 1kHz during 1 sec.
+    // FIXME: No idea how to test for 64 bit processor
+    //        (Probably irrelevant anyhow, though).
+    return false;

 }
 
 }
 

-
-void wxAppTraits::InitializeGui(unsigned long &ulHab)
+void wxAppTraits::InitializeGui(unsigned long &WXUNUSED(ulHab))

 {
 }
 
 {
 }
 

-void wxAppTraits::TerminateGui(unsigned long ulHab)
+void wxAppTraits::TerminateGui(unsigned long WXUNUSED(ulHab))

 {
 }
 
 {
 }
 

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

 {
 {

-    static wxToolkitInfo           vInfo;
-    ULONG                           ulSysInfo[QSV_MAX] = {0};
-    APIRET                          ulrc;
-
-    vInfo.name = _T("wxBase");
-    ulrc = ::DosQuerySysInfo( 1L
-                             ,QSV_MAX
-                             ,(PVOID)ulSysInfo
-                             ,sizeof(ULONG) * QSV_MAX
+    ULONG                 ulSysInfo = 0;
+    APIRET                ulrc;
+
+    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


@@ -390,7 +390,7 @@ const wxChar* wxGetHomeDir(
 #  define MAX_PATH  256
 #endif
 
 #  define MAX_PATH  256
 #endif
 

-    const wxChar *szHome = wxGetenv("HOME");
+    const wxChar *szHome = wxGetenv((wxChar*)"HOME");

     if ( szHome == NULL ) {
       // we're homeless, use current directory.
       rStrDir = wxT(".");
     if ( szHome == NULL ) {
       // we're homeless, use current directory.
       rStrDir = wxT(".");


@@ -401,65 +401,95 @@ const wxChar* wxGetHomeDir(
     return rStrDir.c_str();
 }
 
     return rStrDir.c_str();
 }
 

-// Hack for OS/2
-wxChar* wxGetUserHome (
-  const wxString&                   rUser
-)
+wxString wxGetUserHome ( const wxString &rUser )

 {
 {

-    wxChar*                         zHome;
-    wxString                        sUser1(rUser);
+    wxChar*    zHome;
+    wxString   sUser(rUser);
+
+    wxString home;

 
 

-    wxBuffer = new wxChar[256];

 #ifndef __EMX__
 #ifndef __EMX__

-    if (sUser1 != _T(""))
+    if (!sUser.empty())

     {
     {

-        wxChar                      zTmp[64];
+        const wxString currentUser = wxGetUserId();

 
 

-        if (wxGetUserId( zTmp
-                        ,sizeof(zTmp)/sizeof(char)
-                       ))
+        // Guests belong in the temp dir
+        if ( currentUser == "annonymous" )

         {
         {

-            // Guests belong in the temp dir
-            if (wxStricmp(zTmp, _T("annonymous")) == 0)
-            {
-                if ((zHome = wxGetenv(_T("TMP"))) != NULL    ||
-                    (zHome = wxGetenv(_T("TMPDIR"))) != NULL ||
-                    (zHome = wxGetenv(_T("TEMP"))) != NULL)
-                    delete[] wxBuffer;
-                    return *zHome ? zHome : (wxChar*)_T("\\");
-            }
-            if (wxStricmp(zTmp, WXSTRINGCAST sUser1) == 0)
-                sUser1 = _T("");
+            zHome = wxGetenv(wxT("TMP"));
+            if ( !zHome )
+                zHome = wxGetenv(wxT("TMPDIR"));
+            if ( !zHome )
+                zHome = wxGetenv(wxT("TEMP"));
+
+            if ( zHome && *zHome )
+                return zHome;

         }
         }

+
+        if ( sUser == currentUser )
+            sUser.clear();

     }
 #endif
     }
 #endif

-    if (sUser1 == _T(""))
+    if (sUser.empty())

     {
     {

-        if ((zHome = wxGetenv(_T("HOME"))) != NULL)
+        if ((zHome = wxGetenv(wxT("HOME"))) != NULL)

         {
         {

-            wxStrcpy(wxBuffer, zHome);
-            wxUnix2DosFilename(wxBuffer);
-            wxStrcpy(zHome, wxBuffer);
-            delete[] wxBuffer;
-            return zHome;
+            home = zHome;
+            home.Replace("/", "\\");

         }
     }
         }
     }

-    delete[] wxBuffer;
-    return NULL; // No home known!
+
+    return home;

 }
 
 }
 

-bool wxDirExists(
-  const wxString&                   rDir
-)
+bool wxGetDiskSpace(const wxString& path,
+                    wxDiskspaceSize_t *pTotal,
+                    wxDiskspaceSize_t *pFree)

 {
 {

-    return (::DosSetCurrentDir(WXSTRINGCAST rDir));
+    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 = 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
+    {
+        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 WXDLLEXPORT wxPMErrorToStr(
-  ERRORID                           vError
-)
+wxString wxPMErrorToStr(ERRORID vError)

 {
 {

-    wxString                        sError;
+    wxString sError;

 
     //
     // Remove the high order byte -- it is useless
 
     //
     // Remove the high order byte -- it is useless


@@ -507,17 +537,117 @@ wxString WXDLLEXPORT wxPMErrorToStr(
             sError = wxT("Valid name format, but cannot find name in atom table");
             break;
 
             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");
     }
         default:
             sError = wxT("Unknown error");
     }

-    return(sError);
+    return sError;

 } // end of wxPMErrorToStr
 
 // replacement for implementation in unix/utilsunx.cpp,
 // to be used by all X11 based ports.
 struct wxEndProcessData;
 
 } // end of wxPMErrorToStr
 
 // replacement for implementation in unix/utilsunx.cpp,
 // to be used by all X11 based ports.
 struct wxEndProcessData;
 

-void wxHandleProcessTermination(wxEndProcessData *proc_data)
+void wxHandleProcessTermination(wxEndProcessData *WXUNUSED(proc_data))

 {
     // For now, just do nothing. To be filled in as needed.
 }
 {
     // For now, just do nothing. To be filled in as needed.
 }