X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2478fde622a16d25c66690af353dfdc37e7b582..7dbb435338bce3b3747dcef615e13f80fbff5389:/include/wx/volume.h

diff --git a/include/wx/volume.h b/include/wx/volume.h
index b54a945940..fd6a8370e0 100644
--- a/include/wx/volume.h
+++ b/include/wx/volume.h
@@ -4,28 +4,25 @@
 // Author:      George Policello
 // Modified by:
 // Created:     28 Jan 02
-// RCS-ID:      $Id$
 // Copyright:   (c) 2002 George Policello
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------
-// wxFSVolume represents a volume/drive/mount point in a file system
+// wxFSVolume represents a volume/drive in a file system
 // ----------------------------------------------------------------------------
 
 #ifndef _WX_FSVOLUME_H_
 #define _WX_FSVOLUME_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma interface "fsvolume.h"
-#endif
-
 #include "wx/defs.h"
 
 #if wxUSE_FSVOLUME
 
+#include "wx/arrstr.h"
+
 // the volume flags
-enum
+enum wxFSVolumeFlags
 {
     // is the volume mounted?
     wxFS_VOL_MOUNTED = 0x0001,
@@ -52,7 +49,7 @@ enum wxFSVolumeKind
     wxFS_VOL_MAX
 };
 
-class WXDLLEXPORT wxFSVolumeBase
+class WXDLLIMPEXP_BASE wxFSVolumeBase
 {
 public:
     // return the array containing the names of the volumes
@@ -121,7 +118,7 @@ enum wxFSIconType
 };
 
 // wxFSVolume adds GetIcon() to wxFSVolumeBase
-class wxFSVolume : public wxFSVolumeBase
+class WXDLLIMPEXP_CORE wxFSVolume : public wxFSVolumeBase
 {
 public:
     wxFSVolume() : wxFSVolumeBase() { InitIcons(); }
@@ -139,16 +136,10 @@ private:
 #else // !wxUSE_GUI
 
 // wxFSVolume is the same thing as wxFSVolume in wxBase
-class wxFSVolume : public wxFSVolumeBase
-{
-public:
-    wxFSVolume() : wxFSVolumeBase() { }
-    wxFSVolume(const wxString& name) : wxFSVolumeBase(name) { }
-};
+typedef wxFSVolumeBase wxFSVolume;
 
 #endif // wxUSE_GUI/!wxUSE_GUI
 
 #endif // wxUSE_FSVOLUME
 
 #endif // _WX_FSVOLUME_H_
-