Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/volume.h b/include/wx/volume.h
index 5bac8c1b6eb29fee93f6da894e41d6da2673f2f6..191d69b603fae2d43f5e9c1bfce6bef923e9221f 100644 (file)
--- a/include/wx/volume.h
+++ b/include/wx/volume.h
@@ -10,7 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------
 /////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------

-// wxFSVolume represents a volume/drive/mount point in a file system
+// wxFSVolume represents a volume/drive in a file system

 // ----------------------------------------------------------------------------
 
 #ifndef _WX_FSVOLUME_H_
 // ----------------------------------------------------------------------------
 
 #ifndef _WX_FSVOLUME_H_


@@ -20,8 +20,10 @@
 
 #if wxUSE_FSVOLUME
 
 
 #if wxUSE_FSVOLUME
 

+#include "wx/arrstr.h"
+

 // the volume flags
 // the volume flags

-enum
+enum wxFSVolumeFlags

 {
     // is the volume mounted?
     wxFS_VOL_MOUNTED = 0x0001,
 {
     // is the volume mounted?
     wxFS_VOL_MOUNTED = 0x0001,


@@ -117,7 +119,7 @@ enum wxFSIconType
 };
 
 // wxFSVolume adds GetIcon() to wxFSVolumeBase
 };
 
 // wxFSVolume adds GetIcon() to wxFSVolumeBase

-class wxFSVolume : public wxFSVolumeBase
+class WXDLLIMPEXP_CORE wxFSVolume : public wxFSVolumeBase

 {
 public:
     wxFSVolume() : wxFSVolumeBase() { InitIcons(); }
 {
 public:
     wxFSVolume() : wxFSVolumeBase() { InitIcons(); }


@@ -142,4 +144,3 @@ typedef wxFSVolumeBase wxFSVolume;
 #endif // wxUSE_FSVOLUME
 
 #endif // _WX_FSVOLUME_H_
 #endif // wxUSE_FSVOLUME
 
 #endif // _WX_FSVOLUME_H_

-