X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d9ff0f91fbddae88286567cab74dcfb59c91fc0f..d9b21c9f47f59f36d73220270002b55a7babfdfc:/include/wx/dir.h diff --git a/include/wx/dir.h b/include/wx/dir.h index 4c8a2368cb..1e32ce38a5 100644 --- a/include/wx/dir.h +++ b/include/wx/dir.h @@ -12,7 +12,7 @@ #ifndef _WX_DIR_H_ #define _WX_DIR_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "dir.h" #endif @@ -67,6 +67,8 @@ public: // wxDir: portable equivalent of {open/read/close}dir functions // ---------------------------------------------------------------------------- +class WXDLLEXPORT wxDirData; + class WXDLLEXPORT wxDir { public: @@ -107,12 +109,10 @@ public: bool GetNext(wxString *filename) const; // return true if this directory has any files in it - bool HasFiles(const wxString& spec = wxEmptyString) - { wxString s; return GetFirst(&s, spec, wxDIR_FILES | wxDIR_HIDDEN); } + bool HasFiles(const wxString& spec = wxEmptyString); // return true if this directory has any subdirectories - bool HasSubDirs(const wxString& spec = wxEmptyString) - { wxString s; return GetFirst(&s, spec, wxDIR_DIRS | wxDIR_HIDDEN); } + bool HasSubDirs(const wxString& spec = wxEmptyString); // enumerate all files in this directory and its subdirectories // @@ -132,6 +132,8 @@ private: friend class WXDLLEXPORT wxDirData; wxDirData *m_data; + + DECLARE_NO_COPY_CLASS(wxDir) }; #endif // _WX_DIR_H_