More common code moved from generic dialogs to wxDialogBase::CreateButtonSizer()...

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

diff --git a/include/wx/volume.h b/include/wx/volume.h
index b54a945940ecaa401f97ebdd8b589d6c2bdabf86..b179ca76751abdfa07e6f549d055dd7d5a112509 100644 (file)
--- a/include/wx/volume.h
+++ b/include/wx/volume.h
@@ -16,10 +16,6 @@
 #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
@@ -52,7 +48,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 +117,7 @@ enum wxFSIconType
 };
 
 // wxFSVolume adds GetIcon() to wxFSVolumeBase
-class wxFSVolume : public wxFSVolumeBase
+class WXDLLIMPEXP_CORE wxFSVolume : public wxFSVolumeBase
 {
 public:
     wxFSVolume() : wxFSVolumeBase() { InitIcons(); }
@@ -139,12 +135,7 @@ 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