Assert that m_pendingEvents is not NULL (patch #886852 sort of)

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

diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp
index 1d01ee094f1926d294057c7f7b6ca6da26e7b42f..df321ea4e3e61a1c0fdd58b890bf6c176c782477 100644 (file)
--- a/src/os2/utils.cpp
+++ b/src/os2/utils.cpp
@@ -342,6 +342,15 @@ void wxBell()
     DosBeep(1000,1000); // 1kHz during 1 sec.
 }
 
+
+void wxAppTraits::InitializeGui(unsigned long &ulHab)
+{
+}
+
+void wxAppTraits::TerminateGui(unsigned long ulHab)
+{
+}
+
 wxToolkitInfo & wxConsoleAppTraits::GetToolkitInfo()
 {
     static wxToolkitInfo           vInfo;
@@ -371,18 +380,24 @@ const wxChar* wxGetHomeDir(
     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
 
-    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();
 }