return radio box own help text when origin is Origin_Unknown to make sure GetHelpText...

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

diff --git a/src/common/dircmn.cpp b/src/common/dircmn.cpp
index 1674029b6dc621f23f5bd57a400095af59855b7d..eab16e5bd89946cc118314745864d80d22231b1f 100644 (file)
--- a/src/common/dircmn.cpp
+++ b/src/common/dircmn.cpp
@@ -55,16 +55,16 @@ wxDirTraverser::OnOpenError(const wxString& WXUNUSED(dirname))
 
 // dumb generic implementation
 
-bool wxDir::HasFiles(const wxString& spec)
+bool wxDir::HasFiles(const wxString& spec) const
 {
     wxString s;
     return GetFirst(&s, spec, wxDIR_FILES | wxDIR_HIDDEN);
 }
 
 // we have a (much) faster version for Unix
-#if (defined(__CYGWIN__) && defined(__WINDOWS__)) || !defined(__UNIX_LIKE__) || defined(__WXMAC__) || defined(__EMX__) || defined(__WINE__)
+#if (defined(__CYGWIN__) && defined(__WINDOWS__)) || !defined(__UNIX_LIKE__) || defined(__EMX__) || defined(__WINE__)
 
-bool wxDir::HasSubDirs(const wxString& spec)
+bool wxDir::HasSubDirs(const wxString& spec) const
 {
     wxString s;
     return GetFirst(&s, spec, wxDIR_DIRS | wxDIR_HIDDEN);
@@ -214,7 +214,7 @@ public:
 private:
     wxArrayString& m_files;
 
-    DECLARE_NO_COPY_CLASS(wxDirTraverserSimple)
+    wxDECLARE_NO_COPY_CLASS(wxDirTraverserSimple);
 };
 
 /* static */
@@ -266,7 +266,7 @@ public:
 private:
     wxString m_file;
 
-    DECLARE_NO_COPY_CLASS(wxDirTraverserFindFirst)
+    wxDECLARE_NO_COPY_CLASS(wxDirTraverserFindFirst);
 };
 
 /* static */
@@ -291,10 +291,12 @@ wxString wxDir::FindFirst(const wxString& dirname,
 // wxDir::GetTotalSize()
 // ----------------------------------------------------------------------------
 
+#if wxUSE_LONGLONG
+
 class wxDirTraverserSumSize : public wxDirTraverser
 {
 public:
-    wxDirTraverserSumSize() { m_skippedFiles=false; }
+    wxDirTraverserSumSize() { }
 
     virtual wxDirTraverseResult OnFile(const wxString& filename)
     {
@@ -355,3 +357,4 @@ wxULongLong wxDir::GetTotalSize(const wxString &dirname, wxArrayString *filesSki
     return traverser.GetTotalSize();
 }
 
+#endif // wxUSE_LONGLONG