applying patch 1411230

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

diff --git a/include/wx/dir.h b/include/wx/dir.h
index e1a525cfc2a42d417e4c8dca558e2fe2fb7152e2..c87b753f6d39be2084253ccac0f01d2aaabb87ae 100644 (file)
--- a/include/wx/dir.h
+++ b/include/wx/dir.h
@@ -12,13 +12,7 @@
 #ifndef _WX_DIR_H_
 #define _WX_DIR_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "dir.h"
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/string.h"
-#endif
+#include "wx/string.h"
 
 class WXDLLIMPEXP_BASE wxArrayString;
 
@@ -54,6 +48,8 @@ enum wxDirTraverseResult
 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