don't disable hidden windows in wxWindowDisabler, it's at best useless

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

diff --git a/include/wx/volume.h b/include/wx/volume.h
index 32d2f9fed5313cbe3b86e82e9ec5f02506d4f4b8..6d095f09f7cb0bae434f334881af3d2a381ed101 100644 (file)
--- a/include/wx/volume.h
+++ b/include/wx/volume.h
@@ -6,7 +6,7 @@
 // Created:     28 Jan 02
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 George Policello
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------
@@ -16,10 +16,18 @@
 #ifndef _WX_FSVOLUME_H_
 #define _WX_FSVOLUME_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "fsvolume.h"
 #endif
 
+#include "wx/defs.h"
+
+#if wxUSE_FSVOLUME
+
+#if wxUSE_GUI
+    #include "wx/iconbndl.h" // for wxIconArray
+#endif // wxUSE_GUI
+
 // the volume flags
 enum
 {
@@ -49,6 +57,9 @@ enum wxFSVolumeKind
 };
 
 #if wxUSE_GUI
+
+#include "wx/icon.h"
+
 enum wxFSIconType
 {
     wxFS_VOL_ICO_SMALL = 0,
@@ -57,9 +68,8 @@ enum wxFSIconType
     wxFS_VOL_ICO_SEL_LARGE,
     wxFS_VOL_ICO_MAX
 };
-#endif // wxUSE_GUI
 
-WX_DECLARE_OBJARRAY(wxIcon, wxIconArray);
+#endif // wxUSE_GUI
 
 class WXDLLEXPORT wxFSVolume
 {
@@ -118,5 +128,7 @@ private:
 
 };
 
+#endif // wxUSE_FSVOLUME
+
 #endif // _WX_FSVOLUME_H_