projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reverted return type of wxList method to nodetype * from compatibility_iterator ...
[wxWidgets.git]
/
include
/
wx
/
dir.h
diff --git
a/include/wx/dir.h
b/include/wx/dir.h
index 7cb355ff5b278ec825964fb08160fd57bab6b69a..c87b753f6d39be2084253ccac0f01d2aaabb87ae 100644
(file)
--- a/
include/wx/dir.h
+++ b/
include/wx/dir.h
@@
-12,14
+12,9
@@
#ifndef _WX_DIR_H_
#define _WX_DIR_H_
#ifndef _WX_DIR_H_
#define _WX_DIR_H_
-#if defined(__GNUG__) && !defined(__APPLE__)
- #pragma interface "dir.h"
-#endif
+#include "wx/string.h"
-#ifndef WX_PRECOMP
- #include "wx/string.h"
- #include "wx/arrstr.h"
-#endif
+class WXDLLIMPEXP_BASE wxArrayString;
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
// constants
@@
-53,6
+48,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
+100,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
+110,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;