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 6549a4ae5f1ccedcbed8b340a63995629f9440ca..eab16e5bd89946cc118314745864d80d22231b1f 100644 (file)
--- a/src/common/dircmn.cpp
+++ b/src/common/dircmn.cpp
@@ -35,9 +35,6 @@
 #include "wx/dir.h"
 #include "wx/filename.h"
 
 #include "wx/dir.h"
 #include "wx/filename.h"
 

-// error code of wxFileName::GetSize()
-extern wxULongLong wxInvalidSize;
-

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -58,16 +55,16 @@ wxDirTraverser::OnOpenError(const wxString& WXUNUSED(dirname))
 
 // dumb generic implementation
 
 
 // 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
 {
     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);
 {
     wxString s;
     return GetFirst(&s, spec, wxDIR_DIRS | wxDIR_HIDDEN);


@@ -217,7 +214,7 @@ public:
 private:
     wxArrayString& m_files;
 
 private:
     wxArrayString& m_files;
 

-    DECLARE_NO_COPY_CLASS(wxDirTraverserSimple)
+    wxDECLARE_NO_COPY_CLASS(wxDirTraverserSimple);

 };
 
 /* static */
 };
 
 /* static */


@@ -269,7 +266,7 @@ public:
 private:
     wxString m_file;
 
 private:
     wxString m_file;
 

-    DECLARE_NO_COPY_CLASS(wxDirTraverserFindFirst)
+    wxDECLARE_NO_COPY_CLASS(wxDirTraverserFindFirst);

 };
 
 /* static */
 };
 
 /* static */


@@ -294,6 +291,8 @@ wxString wxDir::FindFirst(const wxString& dirname,
 // wxDir::GetTotalSize()
 // ----------------------------------------------------------------------------
 
 // wxDir::GetTotalSize()
 // ----------------------------------------------------------------------------
 

+#if wxUSE_LONGLONG
+

 class wxDirTraverserSumSize : public wxDirTraverser
 {
 public:
 class wxDirTraverserSumSize : public wxDirTraverser
 {
 public:


@@ -358,3 +357,4 @@ wxULongLong wxDir::GetTotalSize(const wxString &dirname, wxArrayString *filesSki
     return traverser.GetTotalSize();
 }
 
     return traverser.GetTotalSize();
 }
 

+#endif // wxUSE_LONGLONG