X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2478fde622a16d25c66690af353dfdc37e7b582..b057f88ab8d0d448e094204802c9033fad271ccc:/include/wx/volume.h diff --git a/include/wx/volume.h b/include/wx/volume.h index b54a945940..32a2a46306 100644 --- a/include/wx/volume.h +++ b/include/wx/volume.h @@ -16,7 +16,7 @@ #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 @@ -52,7 +52,7 @@ enum wxFSVolumeKind wxFS_VOL_MAX }; -class WXDLLEXPORT wxFSVolumeBase +class WXDLLIMPEXP_BASE wxFSVolumeBase { 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 -class wxFSVolume : public wxFSVolumeBase -{ -public: - wxFSVolume() : wxFSVolumeBase() { } - wxFSVolume(const wxString& name) : wxFSVolumeBase(name) { } -}; +typedef wxFSVolumeBase wxFSVolume; #endif // wxUSE_GUI/!wxUSE_GUI