X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6670f56440ae9209b3e2e51e06acf3bc5aaf1905..7dd40b6f4b31e6bc9c7f626f1461aff8adf7714c:/src/os2/utils.cpp

diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp
index cbec9f74c1..ccf622b9a2 100644
--- a/src/os2/utils.cpp
+++ b/src/os2/utils.cpp
@@ -211,10 +211,10 @@ wxBatteryState wxGetBatteryState()
 // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
 wxMemorySize wxGetFreeMemory()
 {
-    void*                           pMemptr = NULL;
-    LONG                            lSize;
-    ULONG                           lMemFlags;
-    APIRET                          rc;
+    void* pMemptr = NULL;
+    LONG  lSize;
+    ULONG lMemFlags;
+    APIRET rc;
 
     lMemFlags = PAG_FREE;
     rc = ::DosQueryMem(pMemptr, (PULONG)&lSize, &lMemFlags);
@@ -300,68 +300,34 @@ void wxFlushEvents()
 //  wxYield();
 }
 
-#if WXWIN_COMPATIBILITY_2_2
-
-// Output a debug mess., in a system dependent fashion.
-void wxDebugMsg(
-  const wxChar*                     zFmt ...
-)
-{
-    va_list                         vAp;
-    static wxChar                   zBuffer[512];
-
-    if (!wxTheApp->GetWantDebugOutput())
-        return ;
-    va_start(vAp, zFmt);
-    sprintf(zBuffer, zFmt, vAp) ;
-    va_end(vAp);
-}
-
-// Non-fatal error: pop up message box and (possibly) continue
-void wxError(
-  const wxString&                   rMsg
-, const wxString&                   rTitle
-)
-{
-    wxChar *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();
-}
-
-// 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);
-}
-
-#endif // WXWIN_COMPATIBILITY_2_2
-
 // Emit a beeeeeep
 void wxBell()
 {
     DosBeep(1000,1000); // 1kHz during 1 sec.
 }
 
+wxString wxGetOsDescription()
+{
+    wxString strVer(_T("OS/2"));
+    ULONG ulSysInfo[QSV_MAX] = {0};
+
+    if (::DosQuerySysInfo( 1L,
+                           QSV_MAX,
+                           (PVOID)ulSysInfo,
+                           sizeof(ULONG) * QSV_MAX
+                         ) == 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])
+                  );
+        strVer += ver;
+    }
+
+    return strVer;
+}
 
 void wxAppTraits::InitializeGui(unsigned long &WXUNUSED(ulHab))
 {
@@ -428,8 +394,8 @@ const wxMB2WXbuf wxGetUserHome( const wxString &rUser )
 wxChar* wxGetUserHome ( const wxString &rUser )
 #endif
 {
-    wxChar*                         zHome;
-    wxString                        sUser1(rUser);
+    wxChar*    zHome;
+    wxString   sUser1(rUser);
 
     wxChar *wxBuffer = new wxChar[256];
 #ifndef __EMX__
@@ -451,7 +417,7 @@ wxChar* wxGetUserHome ( const wxString &rUser )
                     return *zHome ? zHome : (wxChar*)_T("\\");
             }
             if (wxStricmp(zTmp, WXSTRINGCAST sUser1) == 0)
-                sUser1 = _T("");
+                sUser1 = wxEmptyString;
         }
     }
 #endif