OS/2 patch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/cmndata.cpp

@@ -40,7 +40,7 @@
 #include "wx/log.h"
 
 // For compatibility
-#if (defined(__WXMOTIF__) || defined(__WXGTK__)) && wxUSE_POSTSCRIPT
+#if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__)) && wxUSE_POSTSCRIPT
     #define wxCOMPATIBILITY_WITH_PRINTSETUPDATA 1
 #endif
 

src/common/filefn.cpp

@@ -1524,6 +1524,7 @@ wxString wxFindFirstFile(const wxChar *spec, int flags)
     return result;
 }
 
+
 wxString wxFindNextFile()
 {
     wxString result;
@@ -1595,7 +1596,51 @@ try_again:
     return result;
 }
 
-#endif // Unix/Windows
+#elif defined(__WXPM__)
+
+wxString wxFindFirstFile(const wxChar *spec, int flags)
+{
+    wxString result;
+
+    /*
+    // TODO: figure something out here for OS/2
+    gs_strFileSpec = spec;
+    gs_findFlags = flags;
+
+    // Find path only so we can concatenate found file onto path
+    wxString path(wxPathOnly(gs_strFileSpec));
+    if ( !path.IsEmpty() )
+        result << path << wxT('\\');
+
+    int flag = _A_NORMAL;
+    if (flags & wxDIR)
+        flag = _A_SUBDIR;
+
+    if (_dos_findfirst(WXSTRINGCAST spec, flag, &gs_findDataStruct) == 0)
+    {
+        char attrib;
+        attrib = gs_findDataStruct.attrib;
+
+        if (attrib & _A_SUBDIR) {
+            if (!(gs_findFlags & wxDIR))
+                return wxFindNextFile();
+        } else if (gs_findFlags && !(gs_findFlags & wxFILE))
+            return wxFindNextFile();
+
+        result += gs_findDataStruct.name;
+    }
+    */
+    return result;
+}
+
+wxString wxFindNextFile()
+{
+    wxString result;
+    // TODO:
+    return result;
+}
+
+#endif // Unix/Windows/OS/2
 
 // Get current working directory.
 // If buf is NULL, allocates space using new, else

src/common/object.cpp

@@ -375,9 +375,18 @@ void wxObject::UnRef()
         wxASSERT_MSG( m_refData->m_count > 0, _T("invalid ref data count") );
 
         if ( !--m_refData->m_count )
+#if defined(__VISAGECPP__) && IBMCPP < 400
+            //
+            // don't know what is going on with VA 3.0 but its got some memory problems here
+            // this delete causes a trap in CPPOOM3.DLL
+            //
+            {
+            }
+#else
             delete m_refData;
 
         m_refData = (wxObjectRefData *) NULL;
+#endif
     }
 }