X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f618020a15f1647a83aaeab1fe315f90497a9876..6af4ea87d0c75ab0178a0ed3145bb3a0a0eada91:/include/wx/volume.h?ds=sidebyside diff --git a/include/wx/volume.h b/include/wx/volume.h index 87b9a27ad7..6d095f09f7 100644 --- a/include/wx/volume.h +++ b/include/wx/volume.h @@ -6,7 +6,7 @@ // Created: 28 Jan 02 // RCS-ID: $Id$ // Copyright: (c) 2002 George Policello -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ---------------------------------------------------------------------------- @@ -16,7 +16,7 @@ #ifndef _WX_FSVOLUME_H_ #define _WX_FSVOLUME_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "fsvolume.h" #endif @@ -24,6 +24,10 @@ #if wxUSE_FSVOLUME +#if wxUSE_GUI + #include "wx/iconbndl.h" // for wxIconArray +#endif // wxUSE_GUI + // the volume flags enum { @@ -65,9 +69,6 @@ enum wxFSIconType wxFS_VOL_ICO_MAX }; -// already in wx/iconbndl.h -// WX_DECLARE_EXPORTED_OBJARRAY(wxIcon, wxIconArray); - #endif // wxUSE_GUI class WXDLLEXPORT wxFSVolume