added wxGetCCDefaultFont() returning the default icon font

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

diff --git a/include/wx/volume.h b/include/wx/volume.h
index 2c1a821fa5d58954c4a80624d7497f4705f046f0..32a2a463063db5901dcddb0339b6cb8959072303 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(NO_GCC_PRAGMA)

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


@@ -52,24 +52,7 @@ enum wxFSVolumeKind
     wxFS_VOL_MAX
 };
 
     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
-};
-
-WX_DECLARE_EXPORTED_OBJARRAY(wxIcon, wxIconArray);
-
-#endif // wxUSE_GUI
-
-class WXDLLEXPORT wxFSVolume
+class WXDLLIMPEXP_BASE wxFSVolumeBase

 {
 public:
     // return the array containing the names of the volumes
 {
 public:
     // return the array containing the names of the volumes


@@ -86,8 +69,8 @@ public:
 
     // create the volume object with this name (should be one of those returned
     // by GetVolumes()).
 
     // 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
     bool Create(const wxString& name);
 
     // accessors


@@ -110,22 +93,56 @@ public:
     wxString GetName() const { return m_volName; }
     wxString GetDisplayName() const { return m_dispName; }
 
     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(), ...)?
 
     // TODO: operatios (Mount(), Unmount(), Eject(), ...)?
 

-private:
+protected:
+    // the internal volume name

     wxString m_volName;
     wxString m_volName;

+
+    // the volume name as it is displayed to the user

     wxString m_dispName;
     wxString m_dispName;

-#if wxUSE_GUI
-    wxIconArray m_icons;
-#endif
+
+    // have we been initialized correctly?

     bool m_isOk;
     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 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_
 #endif // wxUSE_FSVOLUME
 
 #endif // _WX_FSVOLUME_H_