better guarding when no printing architecture exists (patch from Joel Low)

[wxWidgets.git] / src / common / filefn.cpp

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 2c9ebbda40cc4ff8ab4c9048fbe0be0258666d1c..0597305a5e6d410c80a0f275efac7caebdb5eb3a 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -230,6 +230,13 @@ bool wxPathList::EnsureFileAccessible (const wxString& path)
     return Add(wxPathOnly(path));
 }
 
+#if WXWIN_COMPATIBILITY_2_6
+bool wxPathList::Member (const wxString& path) const
+{
+    return Index(path) != wxNOT_FOUND;
+}
+#endif
+
 wxString wxPathList::FindValidPath (const wxString& file) const
 {
     // normalize the given string as it could be a path + a filename
@@ -1575,6 +1582,13 @@ wxChar *wxDoGetCwd(wxChar *buf, int sz)
     // __WXWINCE__
 }
 
+#if WXWIN_COMPATIBILITY_2_6
+wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
+{
+    return wxDoGetCwd(buf,sz);
+}
+#endif // WXWIN_COMPATIBILITY_2_6
+
 wxString wxGetCwd()
 {
     wxString str;
@@ -1643,7 +1657,7 @@ wxString wxGetOSDirectory()
     wxChar buf[256];
     GetWindowsDirectory(buf, 256);
     return wxString(buf);
-#elif defined(__WXMAC__) && !defined(__WXOSX_IPHONE__)
+#elif defined(__WXMAC__) && wxOSX_USE_CARBON
     return wxMacFindFolder(kOnSystemDisk, 'macs', false);
 #else
     return wxEmptyString;