no changes, just remove #if'd out code

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

diff --git a/include/wx/dir.h b/include/wx/dir.h
index 99b7b4acf19295409c7de0fc1a7b2ee9c30dbad7..fa50bb25682eabaac950e390fab9392048517403 100644 (file)
--- a/include/wx/dir.h
+++ b/include/wx/dir.h
@@ -23,7 +23,7 @@ class WXDLLIMPEXP_FWD_BASE wxArrayString;
 
 // these flags define what kind of filenames is included in the list of files
 // enumerated by GetFirst/GetNext
 
 // these flags define what kind of filenames is included in the list of files
 // enumerated by GetFirst/GetNext

-enum
+enum wxDirFlags

 {
     wxDIR_FILES     = 0x0001,       // include files
     wxDIR_DIRS      = 0x0002,       // include directories
 {
     wxDIR_FILES     = 0x0001,       // include files
     wxDIR_DIRS      = 0x0002,       // include directories


@@ -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
     //


@@ -156,7 +156,7 @@ private:
 
     wxDirData *m_data;
 
 
     wxDirData *m_data;
 

-    DECLARE_NO_COPY_CLASS(wxDir)
+    wxDECLARE_NO_COPY_CLASS(wxDir);

 };
 
 #endif // _WX_DIR_H_
 };
 
 #endif // _WX_DIR_H_