X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/05815ab32f501810bf0923a511f7d99b90b808a2..0b49ccf8d66e2568e2b0de85c25b406aad39f3b1:/include/wx/volume.h?ds=sidebyside diff --git a/include/wx/volume.h b/include/wx/volume.h index a65ce2f2bb..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,8 +69,6 @@ enum wxFSIconType wxFS_VOL_ICO_MAX }; -WX_DECLARE_OBJARRAY(wxIcon, wxIconArray); - #endif // wxUSE_GUI class WXDLLEXPORT wxFSVolume