fixed incorrect DLL export macro for wxJoystick

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

diff --git a/include/wx/volume.h b/include/wx/volume.h
index b54a945940ecaa401f97ebdd8b589d6c2bdabf86..7ecdb38e30f87b9357c183e9d9ddcf0c7ddcad07 100644 (file)
--- a/include/wx/volume.h
+++ b/include/wx/volume.h
@@ -16,14 +16,12 @@
 #ifndef _WX_FSVOLUME_H_
 #define _WX_FSVOLUME_H_
 
 #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/defs.h"
 
 #if wxUSE_FSVOLUME
 

+#include "wx/arrstr.h"
+

 // the volume flags
 enum
 {
 // the volume flags
 enum
 {


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

-class WXDLLEXPORT 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


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


@@ -139,16 +137,10 @@ 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_FSVOLUME
 
 #endif // _WX_FSVOLUME_H_
 
 #endif // wxUSE_GUI/!wxUSE_GUI
 
 #endif // wxUSE_FSVOLUME
 
 #endif // _WX_FSVOLUME_H_

-