support for using DIBs for wxBitmap implementation (patch 649866)

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

diff --git a/include/wx/dir.h b/include/wx/dir.h
index 4c8a2368cb7edcebf70ecd2805c86b79eccf9bfb..53d2214740a8a49f26d11c7c55e5956bb28780e4 100644 (file)
--- a/include/wx/dir.h
+++ b/include/wx/dir.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DIR_H_
 #define _WX_DIR_H_
 
 #ifndef _WX_DIR_H_
 #define _WX_DIR_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "dir.h"
 #endif
 
     #pragma interface "dir.h"
 #endif
 


@@ -67,6 +67,8 @@ public:
 // wxDir: portable equivalent of {open/read/close}dir functions
 // ----------------------------------------------------------------------------
 
 // wxDir: portable equivalent of {open/read/close}dir functions
 // ----------------------------------------------------------------------------
 

+class WXDLLEXPORT wxDirData;
+

 class WXDLLEXPORT wxDir
 {
 public:
 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 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
 
     // 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
     //
 
     // enumerate all files in this directory and its subdirectories
     //