move code ignoring VK_SPACE and VK_RETURN WM_CHAR messages to MSWDefWindowProc()...

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

diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp
index f6c06af9491ff046e4ef3c52d05cfcc3b588227a..f29aafc86b204b42f4e658b23a64a4744bc9b190 100644 (file)
--- a/src/os2/utils.cpp
+++ b/src/os2/utils.cpp
@@ -19,7 +19,6 @@
 #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/intl.h"
 #include "wx/apptrait.h"
 


@@ -46,7 +45,7 @@
 #include <netbios.h>
 #endif
 
 #include <netbios.h>
 #endif
 

-static const wxChar WX_SECTION[] = _T("wxWindows");
+static const wxChar WX_SECTION[] = _T("wxWidgets");

 static const wxChar eHOSTNAME[]  = _T("HostName");
 static const wxChar eUSERID[]    = _T("UserId");
 static const wxChar eUSERNAME[]  = _T("UserName");
 static const wxChar eHOSTNAME[]  = _T("HostName");
 static const wxChar eUSERID[]    = _T("UserId");
 static const wxChar eUSERNAME[]  = _T("UserName");


@@ -84,19 +83,19 @@ bool wxGetHostName(
 
     if ((zSysname = wxGetenv(_T("SYSTEM_NAME"))) == NULL)
     {
 
     if ((zSysname = wxGetenv(_T("SYSTEM_NAME"))) == NULL)
     {

-        ULONG n = ::PrfQueryProfileString( HINI_PROFILE
-                                          ,(PSZ)WX_SECTION
-                                          ,(PSZ)eHOSTNAME
-                                          ,(PSZ)zDefaultHost
-                                          ,(void*)zBuf
-                                          ,(ULONG)nMaxSize - 1
-                                         );
+        ::PrfQueryProfileString( HINI_PROFILE
+                                ,(PSZ)WX_SECTION
+                                ,(PSZ)eHOSTNAME
+                                ,(PSZ)zDefaultHost
+                                ,(void*)zBuf
+                                ,(ULONG)nMaxSize - 1
+                               );

     }
     else
         wxStrncpy(zBuf, zSysname, nMaxSize - 1);
     zBuf[nMaxSize] = _T('\0');
 #endif
     }
     else
         wxStrncpy(zBuf, zSysname, nMaxSize - 1);
     zBuf[nMaxSize] = _T('\0');
 #endif

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

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


@@ -109,9 +108,9 @@ bool wxGetUserId(
     long                            lrc;
     // UPM procs return 0 on success
     lrc = U32ELOCU((unsigned char*)zBuf, (unsigned long *)&nType);
     long                            lrc;
     // UPM procs return 0 on success
     lrc = U32ELOCU((unsigned char*)zBuf, (unsigned long *)&nType);

-    if (lrc == 0) return TRUE;
+    if (lrc == 0) return true;

 #endif
 #endif

-    return FALSE;
+    return false;

 }
 
 bool wxGetUserName(
 }
 
 bool wxGetUserName(


@@ -126,13 +125,14 @@ bool wxGetUserName(
 #else
     wxStrncpy(zBuf, _T("Unknown User"), nMaxSize);
 #endif
 #else
     wxStrncpy(zBuf, _T("Unknown User"), nMaxSize);
 #endif

-    return TRUE;
+    return true;

 }
 
 int wxKill(
   long                              lPid
 , wxSignal                          eSig
 , wxKillError*                      peError
 }
 
 int wxKill(
   long                              lPid
 , wxSignal                          eSig
 , wxKillError*                      peError

+, int                               flags

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


@@ -147,7 +147,6 @@ bool wxShell(
 {
     wxChar*                         zShell = _T("CMD.EXE");
     wxString                        sInputs;
 {
     wxChar*                         zShell = _T("CMD.EXE");
     wxString                        sInputs;

-    wxChar                          zTmp[255];

     STARTDATA                       SData = {0};
     PSZ                             PgmTitle = "Command Shell";
     APIRET                          rc;
     STARTDATA                       SData = {0};
     PSZ                             PgmTitle = "Command Shell";
     APIRET                          rc;


@@ -202,22 +201,40 @@ bool wxShell(
 bool wxShutdown(wxShutdownFlags wFlags)
 {
     // TODO
 bool wxShutdown(wxShutdownFlags wFlags)
 {
     // TODO

-    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)
 }
 
 // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)

-long wxGetFreeMemory()
+wxMemorySize wxGetFreeMemory()

 {
     void*                           pMemptr = NULL;
 {
     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)
     if (rc != 0)

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

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


@@ -229,14 +246,14 @@ bool wxGetEnv(const wxString& var, wxString *value)
     // wxGetenv is defined as getenv()
     wxChar *p = wxGetenv(var);
     if ( !p )
     // wxGetenv is defined as getenv()
     wxChar *p = wxGetenv(var);
     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)
 }
 
 bool wxSetEnv(const wxString& variable, const wxChar *value)


@@ -258,17 +275,24 @@ 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;
+    return false;

 #endif
 }
 
 #endif
 }
 

-void wxUsleep(
+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
 )


@@ -305,7 +329,7 @@ void wxError(
 , const wxString&                   rTitle
 )
 {
 , const wxString&                   rTitle
 )
 {

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

     wxSprintf(wxBuffer, "%s\nContinue?", WXSTRINGCAST rMsg);
     if (::WinMessageBox( HWND_DESKTOP
                         ,NULL
     wxSprintf(wxBuffer, "%s\nContinue?", WXSTRINGCAST rMsg);
     if (::WinMessageBox( HWND_DESKTOP
                         ,NULL


@@ -344,11 +368,20 @@ void wxBell()
     DosBeep(1000,1000); // 1kHz during 1 sec.
 }
 
     DosBeep(1000,1000); // 1kHz during 1 sec.
 }
 

+
+void wxAppTraits::InitializeGui(unsigned long &ulHab)
+{
+}
+
+void wxAppTraits::TerminateGui(unsigned long ulHab)
+{
+}
+

 wxToolkitInfo & wxConsoleAppTraits::GetToolkitInfo()
 {
 wxToolkitInfo & wxConsoleAppTraits::GetToolkitInfo()
 {

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

 
     vInfo.name = _T("wxBase");
     ulrc = ::DosQuerySysInfo( 1L
 
     vInfo.name = _T("wxBase");
     ulrc = ::DosQuerySysInfo( 1L


@@ -373,18 +406,24 @@ const wxChar* wxGetHomeDir(
     wxString&                       rStrDir = *pStr;
 
     // OS/2 has no idea about home,
     wxString&                       rStrDir = *pStr;
 
     // OS/2 has no idea about home,

-    // so use the working directory instead?
+    // 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
 #ifndef MAX_PATH
 #  define MAX_PATH  256
 #endif
 
 
     // 256 was taken from os2def.h
 #ifndef MAX_PATH
 #  define MAX_PATH  256
 #endif
 

-    char                            zDirName[256];
-    ULONG                           ulDirLen;
+    const wxChar *szHome = wxGetenv("HOME");
+    if ( szHome == NULL ) {
+      // we're homeless, use current directory.
+      rStrDir = wxT(".");
+    }
+    else
+       rStrDir = szHome;

 
 

-    ::DosQueryCurrentDir(0, zDirName, &ulDirLen);
-    rStrDir = zDirName;

     return rStrDir.c_str();
 }
 
     return rStrDir.c_str();
 }
 


@@ -396,9 +435,9 @@ wxChar* wxGetUserHome (
     wxChar*                         zHome;
     wxString                        sUser1(rUser);
 
     wxChar*                         zHome;
     wxString                        sUser1(rUser);
 

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

 #ifndef __EMX__
 #ifndef __EMX__

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

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


@@ -420,7 +459,7 @@ wxChar* wxGetUserHome (
         }
     }
 #endif
         }
     }
 #endif

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

     {
         if ((zHome = wxGetenv(_T("HOME"))) != NULL)
         {
     {
         if ((zHome = wxGetenv(_T("HOME"))) != NULL)
         {


@@ -435,13 +474,6 @@ wxChar* wxGetUserHome (
     return NULL; // No home known!
 }
 
     return NULL; // No home known!
 }
 

-bool wxDirExists(
-  const wxString&                   rDir
-)
-{
-    return (::DosSetCurrentDir(WXSTRINGCAST rDir));
-}
-

 wxString WXDLLEXPORT wxPMErrorToStr(
   ERRORID                           vError
 )
 wxString WXDLLEXPORT wxPMErrorToStr(
   ERRORID                           vError
 )