Some fixes for wxURLDataObject when wxUSE_UNICODE==1

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

diff --git a/src/common/dircmn.cpp b/src/common/dircmn.cpp
index c39290a58cdc418f6845ad6478cd424ac44233fd..074cd75f9e957a4eb175f9caea118a646158fe85 100644 (file)
--- a/src/common/dircmn.cpp
+++ b/src/common/dircmn.cpp
@@ -34,6 +34,7 @@
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"
+    #include "wx/filefn.h"
 #endif //WX_PRECOMP
 
 #include "wx/dir.h"
@@ -42,6 +43,31 @@
 // implementation
 // ============================================================================
 
+// ----------------------------------------------------------------------------
+// wxDir::HasFiles() and HasSubDirs()
+// ----------------------------------------------------------------------------
+
+// dumb generic implementation
+
+bool wxDir::HasFiles(const wxString& spec)
+{
+    wxString s;
+    return GetFirst(&s, spec, wxDIR_FILES | wxDIR_HIDDEN);
+}
+
+// we have a (much) faster version for Unix
+// MBN: Cygwin should use the Unix version, but with the current build sistem
+//      this is painful
+#if defined(__CYGWIN__) || !defined(__UNIX_LIKE__) || defined(__WXMAC__)
+
+bool wxDir::HasSubDirs(const wxString& spec)
+{
+    wxString s;
+    return GetFirst(&s, spec, wxDIR_DIRS | wxDIR_HIDDEN);
+}
+
+#endif // !Unix
+
 // ----------------------------------------------------------------------------
 // wxDir::Traverse()
 // ----------------------------------------------------------------------------