X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/371a5b4e62eb415107e045588f614fa49e866e78..1cf57808cb146742378d24faa77b9e9482c86b2b:/include/wx/volume.h diff --git a/include/wx/volume.h b/include/wx/volume.h index 6d095f09f7..7ecdb38e30 100644 --- a/include/wx/volume.h +++ b/include/wx/volume.h @@ -16,17 +16,11 @@ #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 -#if wxUSE_GUI - #include "wx/iconbndl.h" // for wxIconArray -#endif // wxUSE_GUI +#include "wx/arrstr.h" // the volume flags enum @@ -56,22 +50,7 @@ enum wxFSVolumeKind wxFS_VOL_MAX }; -#if wxUSE_GUI - -#include "wx/icon.h" - -enum wxFSIconType -{ - wxFS_VOL_ICO_SMALL = 0, - wxFS_VOL_ICO_LARGE, - wxFS_VOL_ICO_SEL_SMALL, - wxFS_VOL_ICO_SEL_LARGE, - wxFS_VOL_ICO_MAX -}; - -#endif // wxUSE_GUI - -class WXDLLEXPORT wxFSVolume +class WXDLLIMPEXP_BASE wxFSVolumeBase { public: // return the array containing the names of the volumes @@ -88,8 +67,8 @@ public: // create the volume object with this name (should be one of those returned // by GetVolumes()). - wxFSVolume(); - wxFSVolume(const wxString& name); + wxFSVolumeBase(); + wxFSVolumeBase(const wxString& name); bool Create(const wxString& name); // accessors @@ -112,23 +91,56 @@ public: wxString GetName() const { return m_volName; } wxString GetDisplayName() const { return m_dispName; } -#if wxUSE_GUI - wxIcon GetIcon(wxFSIconType type) const; -#endif - // TODO: operatios (Mount(), Unmount(), Eject(), ...)? -private: +protected: + // the internal volume name wxString m_volName; + + // the volume name as it is displayed to the user wxString m_dispName; -#if wxUSE_GUI - wxIconArray m_icons; -#endif + + // have we been initialized correctly? bool m_isOk; +}; +#if wxUSE_GUI + +#include "wx/icon.h" +#include "wx/iconbndl.h" // only for wxIconArray + +enum wxFSIconType +{ + wxFS_VOL_ICO_SMALL = 0, + wxFS_VOL_ICO_LARGE, + wxFS_VOL_ICO_SEL_SMALL, + wxFS_VOL_ICO_SEL_LARGE, + wxFS_VOL_ICO_MAX }; +// wxFSVolume adds GetIcon() to wxFSVolumeBase +class WXDLLIMPEXP_CORE wxFSVolume : public wxFSVolumeBase +{ +public: + wxFSVolume() : wxFSVolumeBase() { InitIcons(); } + wxFSVolume(const wxString& name) : wxFSVolumeBase(name) { InitIcons(); } + + wxIcon GetIcon(wxFSIconType type) const; + +private: + void InitIcons(); + + // the different icons for this volume (created on demand) + wxIconArray m_icons; +}; + +#else // !wxUSE_GUI + +// wxFSVolume is the same thing as wxFSVolume in wxBase +typedef wxFSVolumeBase wxFSVolume; + +#endif // wxUSE_GUI/!wxUSE_GUI + #endif // wxUSE_FSVOLUME #endif // _WX_FSVOLUME_H_ -