don't disable hidden windows in wxWindowDisabler, it's at best useless

[wxWidgets.git] / include / wx / volume.h

diff --git a/include/wx/volume.h b/include/wx/volume.h
index 2c1a821fa5d58954c4a80624d7497f4705f046f0..6d095f09f7cb0bae434f334881af3d2a381ed101 100644 (file)
--- 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
 // 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_
 
 #ifndef _WX_FSVOLUME_H_
 #define _WX_FSVOLUME_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "fsvolume.h"
 #endif
 
     #pragma interface "fsvolume.h"
 #endif
 


@@ -24,6 +24,10 @@
 
 #if wxUSE_FSVOLUME
 
 
 #if wxUSE_FSVOLUME
 

+#if wxUSE_GUI
+    #include "wx/iconbndl.h" // for wxIconArray
+#endif // wxUSE_GUI
+

 // the volume flags
 enum
 {
 // the volume flags
 enum
 {


@@ -65,8 +69,6 @@ enum wxFSIconType
     wxFS_VOL_ICO_MAX
 };
 
     wxFS_VOL_ICO_MAX
 };
 

-WX_DECLARE_EXPORTED_OBJARRAY(wxIcon, wxIconArray);
-

 #endif // wxUSE_GUI
 
 class WXDLLEXPORT wxFSVolume
 #endif // wxUSE_GUI
 
 class WXDLLEXPORT wxFSVolume