bug fixes

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

diff --git a/include/wx/volume.h b/include/wx/volume.h
index 87b9a27ad7166c75cf9fa4b286f8850f112d08a9..8b6038d057a1233eb19ded34f1e314720a91d3bb 100644 (file)
--- a/include/wx/volume.h
+++ b/include/wx/volume.h
@@ -16,7 +16,7 @@
 #ifndef _WX_FSVOLUME_H_
 #define _WX_FSVOLUME_H_
 
 #ifndef _WX_FSVOLUME_H_
 #define _WX_FSVOLUME_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "fsvolume.h"
 #endif
 
     #pragma interface "fsvolume.h"
 #endif
 


@@ -24,6 +24,10 @@
 
 #if wxUSE_FSVOLUME
 
 
 #if wxUSE_FSVOLUME
 

+#if wxUSE_GUI
+    #include "wx/iconbndl.h" // for wxIconArray
+#endif // wxUSE_GUI
+

 // the volume flags
 enum
 {
 // the volume flags
 enum
 {


@@ -65,9 +69,6 @@ enum wxFSIconType
     wxFS_VOL_ICO_MAX
 };
 
     wxFS_VOL_ICO_MAX
 };
 

-// already in wx/iconbndl.h
-// WX_DECLARE_EXPORTED_OBJARRAY(wxIcon, wxIconArray);
-

 #endif // wxUSE_GUI
 
 class WXDLLEXPORT wxFSVolume
 #endif // wxUSE_GUI
 
 class WXDLLEXPORT wxFSVolume