Implemented PocketPC menubar/toolbar as wxToolMenuBar derived

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

diff --git a/include/wx/dir.h b/include/wx/dir.h
index 7cb355ff5b278ec825964fb08160fd57bab6b69a..dba3313204bd0e7c4f316dc2f7d19e9c05e6486b 100644 (file)
--- a/include/wx/dir.h
+++ b/include/wx/dir.h
@@ -12,15 +12,16 @@
 #ifndef _WX_DIR_H_
 #define _WX_DIR_H_
 
 #ifndef _WX_DIR_H_
 #define _WX_DIR_H_
 

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

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

-    #include  "wx/string.h"
-    #include "wx/arrstr.h"
+    #include "wx/string.h"

 #endif
 
 #endif
 

+class WXDLLIMPEXP_BASE wxArrayString;
+

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------


@@ -53,6 +54,8 @@ enum wxDirTraverseResult
 class WXDLLIMPEXP_BASE wxDirTraverser
 {
 public:
 class WXDLLIMPEXP_BASE wxDirTraverser
 {
 public:

+    /// a virtual dtor has been provided since this class has virtual members
+    virtual ~wxDirTraverser() { }

     // called for each file found by wxDir::Traverse()
     //
     // return wxDIR_STOP or wxDIR_CONTINUE from here (wxDIR_IGNORE doesn't
     // called for each file found by wxDir::Traverse()
     //
     // return wxDIR_STOP or wxDIR_CONTINUE from here (wxDIR_IGNORE doesn't


@@ -103,7 +106,7 @@ public:
     // open the directory for enumerating
     bool Open(const wxString& dir);
 
     // open the directory for enumerating
     bool Open(const wxString& dir);
 

-    // returns TRUE if the directory was successfully opened
+    // returns true if the directory was successfully opened

     bool IsOpened() const;
 
     // get the full name of the directory (without '/' at the end)
     bool IsOpened() const;
 
     // get the full name of the directory (without '/' at the end)


@@ -113,7 +116,7 @@ public:
     // -------------------------
 
     // start enumerating all files matching filespec (or all files if it is
     // -------------------------
 
     // start enumerating all files matching filespec (or all files if it is

-    // empty) and flags, return TRUE on success
+    // empty) and flags, return true on success

     bool GetFirst(wxString *filename,
                   const wxString& filespec = wxEmptyString,
                   int flags = wxDIR_DEFAULT) const;
     bool GetFirst(wxString *filename,
                   const wxString& filespec = wxEmptyString,
                   int flags = wxDIR_DEFAULT) const;