X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12839f76d85b0092036ab0ac42cb2934b037cef2..a6ac49b198cf4693752344cffa20b46bed364c77:/src/palmos/volume.cpp?ds=sidebyside

diff --git a/src/palmos/volume.cpp b/src/palmos/volume.cpp
index 34a1c39cb0..ed18fd3840 100644
--- a/src/palmos/volume.cpp
+++ b/src/palmos/volume.cpp
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        src/palmos/volume.cpp
 // Purpose:     wxFSVolume - encapsulates system volume information
-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port
 // Modified by:
 // Created:     10/13/04
-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "fsvolume.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
@@ -29,17 +25,23 @@
 
 #if wxUSE_FSVOLUME
 
+#include "wx/volume.h"
+
 #ifndef WX_PRECOMP
     #if wxUSE_GUI
         #include "wx/icon.h"
     #endif
     #include "wx/intl.h"
+    #include "wx/arrstr.h"
+    #include "wx/hashmap.h"
 #endif // WX_PRECOMP
 
-#include "wx/arrstr.h"
-#include "wx/volume.h"
-
-#include "VFSMgr.h"
+#include <VFSMgr.h>
+#ifdef __WXPALMOS6__
+#include <PalmTypesCompatibility.h>
+#else
+#include <PalmCompatibility.h>
+#endif
 
 #if wxUSE_BASE
 
@@ -101,7 +103,7 @@ static unsigned GetBasicFlags(const wxChar* filename)
 // Purpose: Add a file to the list if it meets the filter requirement.
 // Notes: - See GetBasicFlags for remarks about the Mounted flag.
 //=============================================================================
-static bool FilteredAdd(wxArrayString& list, const wxChar* filename, 
+static bool FilteredAdd(wxArrayString& list, const wxChar* filename,
                         unsigned flagsSet, unsigned flagsUnset)
 {
     return false;
@@ -139,7 +141,7 @@ wxArrayString wxFSVolumeBase::GetVolumes(int flagsSet, int flagsUnset)
 
         if (err != errNone)
             break;
-    } 
+    }
 
     return list;
 } // GetVolumes
@@ -235,4 +237,3 @@ wxIcon wxFSVolume::GetIcon(wxFSIconType type) const
 #endif // wxUSE_GUI
 
 #endif // wxUSE_FSVOLUME
-