Add some version checks to help compiling on OSX.

[wxWidgets.git] / src / palmos / volume.cpp

diff --git a/src/palmos/volume.cpp b/src/palmos/volume.cpp
index dc49c85693418d1618e36095d09babdb4f209bac..ed18fd3840923c7c038bafdc75b3341268046540 100644 (file)
--- a/src/palmos/volume.cpp
+++ b/src/palmos/volume.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "fsvolume.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -29,18 +25,23 @@
 
 #if wxUSE_FSVOLUME
 
 
 #if wxUSE_FSVOLUME
 

+#include "wx/volume.h"
+

 #ifndef WX_PRECOMP
     #if wxUSE_GUI
         #include "wx/icon.h"
     #endif
     #include "wx/intl.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
 
 #endif // WX_PRECOMP
 

-#include "wx/arrstr.h"
-#include "wx/volume.h"
-

 #include <VFSMgr.h>
 #include <VFSMgr.h>

+#ifdef __WXPALMOS6__

 #include <PalmTypesCompatibility.h>
 #include <PalmTypesCompatibility.h>

+#else
+#include <PalmCompatibility.h>
+#endif

 
 #if wxUSE_BASE
 
 
 #if wxUSE_BASE
 


@@ -236,4 +237,3 @@ wxIcon wxFSVolume::GetIcon(wxFSIconType type) const
 #endif // wxUSE_GUI
 
 #endif // wxUSE_FSVOLUME
 #endif // wxUSE_GUI
 
 #endif // wxUSE_FSVOLUME

-