wxITEM_FOO instead of wxItem_Foo, for the sake of consistency

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

diff --git a/include/wx/volume.h b/include/wx/volume.h
index 32d2f9fed5313cbe3b86e82e9ec5f02506d4f4b8..2c1a821fa5d58954c4a80624d7497f4705f046f0 100644 (file)
--- a/include/wx/volume.h
+++ b/include/wx/volume.h
@@ -20,6 +20,10 @@
     #pragma interface "fsvolume.h"
 #endif
 
+#include "wx/defs.h"
+
+#if wxUSE_FSVOLUME
+
 // the volume flags
 enum
 {
@@ -49,6 +53,9 @@ enum wxFSVolumeKind
 };
 
 #if wxUSE_GUI
+
+#include "wx/icon.h"
+
 enum wxFSIconType
 {
     wxFS_VOL_ICO_SMALL = 0,
@@ -57,9 +64,10 @@ enum wxFSIconType
     wxFS_VOL_ICO_SEL_LARGE,
     wxFS_VOL_ICO_MAX
 };
-#endif // wxUSE_GUI
 
-WX_DECLARE_OBJARRAY(wxIcon, wxIconArray);
+WX_DECLARE_EXPORTED_OBJARRAY(wxIcon, wxIconArray);
+
+#endif // wxUSE_GUI
 
 class WXDLLEXPORT wxFSVolume
 {
@@ -118,5 +126,7 @@ private:
 
 };
 
+#endif // wxUSE_FSVOLUME
+
 #endif // _WX_FSVOLUME_H_