added fix for MSL under Win32 (by Steve Hartwell)

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

diff --git a/include/wx/volume.h b/include/wx/volume.h
index 62406e75917789195b70ea04ad3e6fb159f67732..32a2a463063db5901dcddb0339b6cb8959072303 100644 (file)
--- a/include/wx/volume.h
+++ b/include/wx/volume.h
@@ -16,7 +16,7 @@
 #ifndef _WX_FSVOLUME_H_
 #define _WX_FSVOLUME_H_
 
 #ifndef _WX_FSVOLUME_H_
 #define _WX_FSVOLUME_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "fsvolume.h"
 #endif
 
     #pragma interface "fsvolume.h"
 #endif
 


@@ -52,7 +52,7 @@ enum wxFSVolumeKind
     wxFS_VOL_MAX
 };
 
     wxFS_VOL_MAX
 };
 

-class WXDLLEXPORT_BASE wxFSVolumeBase
+class WXDLLIMPEXP_BASE wxFSVolumeBase

 {
 public:
     // return the array containing the names of the volumes
 {
 public:
     // return the array containing the names of the volumes


@@ -139,12 +139,7 @@ private:
 #else // !wxUSE_GUI
 
 // wxFSVolume is the same thing as wxFSVolume in wxBase
 #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_GUI/!wxUSE_GUI