always let the multiline text control process the Enter key presses

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

diff --git a/include/wx/volume.h b/include/wx/volume.h
index 32d2f9fed5313cbe3b86e82e9ec5f02506d4f4b8..902e74bf82b200e0686ef4142d67d192a6d4e508 100644 (file)
--- a/include/wx/volume.h
+++ b/include/wx/volume.h
@@ -20,6 +20,14 @@
     #pragma interface "fsvolume.h"
 #endif
 
     #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
 {
 // the volume flags
 enum
 {


@@ -49,6 +57,9 @@ enum wxFSVolumeKind
 };
 
 #if wxUSE_GUI
 };
 
 #if wxUSE_GUI

+
+#include "wx/icon.h"
+

 enum wxFSIconType
 {
     wxFS_VOL_ICO_SMALL = 0,
 enum wxFSIconType
 {
     wxFS_VOL_ICO_SMALL = 0,


@@ -57,9 +68,8 @@ enum wxFSIconType
     wxFS_VOL_ICO_SEL_LARGE,
     wxFS_VOL_ICO_MAX
 };
     wxFS_VOL_ICO_SEL_LARGE,
     wxFS_VOL_ICO_MAX
 };

-#endif // wxUSE_GUI

 
 

-WX_DECLARE_OBJARRAY(wxIcon, wxIconArray);
+#endif // wxUSE_GUI

 
 class WXDLLEXPORT wxFSVolume
 {
 
 class WXDLLEXPORT wxFSVolume
 {


@@ -118,5 +128,7 @@ private:
 
 };
 
 
 };
 

+#endif // wxUSE_FSVOLUME
+

 #endif // _WX_FSVOLUME_H_
 
 #endif // _WX_FSVOLUME_H_