rolled back exceptions handling patch, it relied on incorrect assumption about vtables

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

diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp
index 678f7c0edc033fc05bd1319a52c97bea197bd113..d77c05e60de94c53e12546bdf28a79f2f77f2907 100644 (file)
--- a/src/os2/utils.cpp
+++ b/src/os2/utils.cpp
@@ -160,9 +160,9 @@ bool wxShell(
     SData.FgBg     = SSF_FGBG_FORE;
     SData.TraceOpt = SSF_TRACEOPT_NONE;
     SData.PgmTitle = PgmTitle;
     SData.FgBg     = SSF_FGBG_FORE;
     SData.TraceOpt = SSF_TRACEOPT_NONE;
     SData.PgmTitle = PgmTitle;

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

 
 

-    sInputs = "/C " + rCommand;
+    sInputs = _T("/C ") + rCommand;

     SData.PgmInputs     = (BYTE*)sInputs.c_str();
     SData.TermQ         = 0;
     SData.Environment   = 0;
     SData.PgmInputs     = (BYTE*)sInputs.c_str();
     SData.TermQ         = 0;
     SData.Environment   = 0;


@@ -204,21 +204,39 @@ bool wxShutdown(wxShutdownFlags wFlags)
     return false;
 }
 
     return false;
 }
 

+wxPowerType wxGetPowerType()
+{
+    // TODO
+    return wxPOWER_UNKNOWN;
+}
+
+wxBatteryState wxGetBatteryState()
+{
+    // TODO
+    return wxBATTERY_UNKNOWN_STATE;
+}
+

 // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
 wxMemorySize wxGetFreeMemory()
 {
     void*                           pMemptr = NULL;
 // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
 wxMemorySize wxGetFreeMemory()
 {
     void*                           pMemptr = NULL;

-    ULONG                           lSize;
+    LONG                            lSize;

     ULONG                           lMemFlags;
     APIRET                          rc;
 
     lMemFlags = PAG_FREE;
     ULONG                           lMemFlags;
     APIRET                          rc;
 
     lMemFlags = PAG_FREE;

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

     if (rc != 0)
         lSize = -1L;
     return (wxMemorySize)lSize;
 }
 
     if (rc != 0)
         lSize = -1L;
     return (wxMemorySize)lSize;
 }
 

+// Get Process ID
+unsigned long wxGetProcessId()
+{
+    return (unsigned long)getpid();
+}
+

 // ----------------------------------------------------------------------------
 // env vars
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // env vars
 // ----------------------------------------------------------------------------


@@ -398,7 +416,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(".");


@@ -410,16 +428,18 @@ const wxChar* wxGetHomeDir(
 }
 
 // Hack for OS/2
 }
 
 // Hack for OS/2

-wxChar* wxGetUserHome (
-  const wxString&                   rUser
-)
+#if wxUSE_UNICODE
+const wxMB2WXbuf wxGetUserHome( const wxString &rUser )
+#else // just for binary compatibility -- there is no 'const' here
+wxChar* wxGetUserHome ( const wxString &rUser )
+#endif

 {
     wxChar*                         zHome;
     wxString                        sUser1(rUser);
 
 {
     wxChar*                         zHome;
     wxString                        sUser1(rUser);
 

-    char *wxBuffer = new wxChar[256];
+    wxChar *wxBuffer = new wxChar[256];

 #ifndef __EMX__
 #ifndef __EMX__

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

     {
         wxChar                      zTmp[64];
 
     {
         wxChar                      zTmp[64];
 


@@ -441,26 +461,25 @@ wxChar* wxGetUserHome (
         }
     }
 #endif
         }
     }
 #endif

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

     {
         if ((zHome = wxGetenv(_T("HOME"))) != NULL)
         {
             wxStrcpy(wxBuffer, zHome);
             wxUnix2DosFilename(wxBuffer);
     {
         if ((zHome = wxGetenv(_T("HOME"))) != NULL)
         {
             wxStrcpy(wxBuffer, zHome);
             wxUnix2DosFilename(wxBuffer);

+#if wxUSE_UNICODE
+           wxWCharBuffer retBuffer (wxBuffer);
+            delete[] wxBuffer;
+            return retBuffer;
+#else      

             wxStrcpy(zHome, wxBuffer);
             delete[] wxBuffer;
             return zHome;
             wxStrcpy(zHome, wxBuffer);
             delete[] wxBuffer;
             return zHome;

+#endif

         }
     }
     delete[] wxBuffer;
         }
     }
     delete[] wxBuffer;

-    return NULL; // No home known!
-}
-
-bool wxDirExists(
-  const wxString&                   rDir
-)
-{
-    return (::DosSetCurrentDir(WXSTRINGCAST rDir));
+    return (wxChar*)wxEmptyString; // No home known!

 }
 
 wxString WXDLLEXPORT wxPMErrorToStr(
 }
 
 wxString WXDLLEXPORT wxPMErrorToStr(