make wxSocketImplUnix inherit from wxFDIOHandler as they're used for almost the same...

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

diff --git a/include/wx/volume.h b/include/wx/volume.h
index 43a1c2ab9da9f3f692a6e5191508a0cd574b1f3e..191d69b603fae2d43f5e9c1bfce6bef923e9221f 100644 (file)
--- a/include/wx/volume.h
+++ b/include/wx/volume.h
@@ -6,26 +6,24 @@
 // Created:     28 Jan 02
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 George Policello
 // Created:     28 Jan 02
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 George Policello

-// Licence:     wxWidgets licence
+// 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_
 
 // ----------------------------------------------------------------------------
 
 #ifndef _WX_FSVOLUME_H_
 #define _WX_FSVOLUME_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "fsvolume.h"
-#endif
-

 #include "wx/defs.h"
 
 #if wxUSE_FSVOLUME
 
 #include "wx/defs.h"
 
 #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,


@@ -121,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(); }


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

-