correct access for virtuals

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

diff --git a/include/wx/filename.h b/include/wx/filename.h
index ad9feee7af846275d3a210d997932de4b73ca72b..1d4f7f66d2fa6e3b53d697ea75f9bbc8d4b0d524 100644 (file)
--- a/include/wx/filename.h
+++ b/include/wx/filename.h
@@ -12,15 +12,6 @@
 #ifndef   _WX_FILENAME_H_
 #define   _WX_FILENAME_H_
 
 #ifndef   _WX_FILENAME_H_
 #define   _WX_FILENAME_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "filename.h"
-#endif
-
-#ifndef WX_PRECOMP
-    #include  "wx/string.h"
-    #include  "wx/arrstr.h"
-#endif
-

 /*
     TODO:
 
 /*
     TODO:
 


@@ -35,6 +26,7 @@
     3. SameFileAs() function to compare inodes under Unix
  */
 
     3. SameFileAs() function to compare inodes under Unix
  */
 

+#include "wx/arrstr.h"

 #include "wx/filefn.h"
 #include "wx/datetime.h"
 
 #include "wx/filefn.h"
 #include "wx/datetime.h"
 


@@ -451,7 +443,7 @@ public:
         { return GetPath(withSep ? wxPATH_GET_SEPARATOR : 0, format); }
 #endif
     wxString GetPathWithSep(wxPathFormat format = wxPATH_NATIVE ) const
         { return GetPath(withSep ? wxPATH_GET_SEPARATOR : 0, format); }
 #endif
     wxString GetPathWithSep(wxPathFormat format = wxPATH_NATIVE ) const

-        { return GetPath(wxPATH_GET_SEPARATOR, format); }
+        { return GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR, format); }

 
 private:
     // check whether this dir is valid for Append/Prepend/InsertDir()
 
 private:
     // check whether this dir is valid for Append/Prepend/InsertDir()