X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..09b895cb4a954494063eb17d3dc302a654fd99e5:/include/wx/volume.h diff --git a/include/wx/volume.h b/include/wx/volume.h index 17645ade60..7ecdb38e30 100644 --- a/include/wx/volume.h +++ b/include/wx/volume.h @@ -16,14 +16,12 @@ #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/arrstr.h" + // the volume flags enum { @@ -121,7 +119,7 @@ enum wxFSIconType }; // wxFSVolume adds GetIcon() to wxFSVolumeBase -class wxFSVolume : public wxFSVolumeBase +class WXDLLIMPEXP_CORE wxFSVolume : public wxFSVolumeBase { public: wxFSVolume() : wxFSVolumeBase() { InitIcons(); } @@ -139,16 +137,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_ -