fix mouse capture lost assert when dialog shown in tab change event handler

[wxWidgets.git] / include / wx / dir.h

diff --git a/include/wx/dir.h b/include/wx/dir.h
index 14ed2ab963d70ae9bef736b0036f085f410e9da5..9a73c6644e0e85258388f98a9f2eff19c98aa8c9 100644 (file)
--- a/include/wx/dir.h
+++ b/include/wx/dir.h
@@ -63,7 +63,7 @@ public:
     virtual wxDirTraverseResult OnDir(const wxString& dirname) = 0;
 
     // called for each directory which we couldn't open during our traversal
     virtual wxDirTraverseResult OnDir(const wxString& dirname) = 0;
 
     // called for each directory which we couldn't open during our traversal

-    // of the directory tyree
+    // of the directory tree

     //
     // this method can also return either wxDIR_STOP, wxDIR_IGNORE or
     // wxDIR_CONTINUE but the latter is treated specially: it means to retry
     //
     // this method can also return either wxDIR_STOP, wxDIR_IGNORE or
     // wxDIR_CONTINUE but the latter is treated specially: it means to retry


@@ -95,7 +95,7 @@ public:
     // opens the directory for enumeration, use IsOpened() to test success
     wxDir(const wxString& dir);
 
     // opens the directory for enumeration, use IsOpened() to test success
     wxDir(const wxString& dir);
 

-    // dtor cleans up the associated ressources
+    // dtor cleans up the associated resources

     ~wxDir();
 
     // open the directory for enumerating
     ~wxDir();
 
     // open the directory for enumerating


@@ -120,10 +120,10 @@ public:
     bool GetNext(wxString *filename) const;
 
     // return true if this directory has any files in it
     bool GetNext(wxString *filename) const;
 
     // return true if this directory has any files in it

-    bool HasFiles(const wxString& spec = wxEmptyString);
+    bool HasFiles(const wxString& spec = wxEmptyString) const;

 
     // return true if this directory has any subdirectories
 
     // return true if this directory has any subdirectories

-    bool HasSubDirs(const wxString& spec = wxEmptyString);
+    bool HasSubDirs(const wxString& spec = wxEmptyString) const;

 
     // enumerate all files in this directory and its subdirectories
     //
 
     // enumerate all files in this directory and its subdirectories
     //


@@ -146,8 +146,10 @@ public:
                               const wxString& filespec,
                               int flags = wxDIR_DEFAULT);
 
                               const wxString& filespec,
                               int flags = wxDIR_DEFAULT);
 

+#if wxUSE_LONGLONG

     // returns the size of all directories recursively found in given path
     static wxULongLong GetTotalSize(const wxString &dir, wxArrayString *filesSkipped = NULL);
     // returns the size of all directories recursively found in given path
     static wxULongLong GetTotalSize(const wxString &dir, wxArrayString *filesSkipped = NULL);

+#endif // wxUSE_LONGLONG

 
 private:
     friend class wxDirData;
 
 private:
     friend class wxDirData;