Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/interface/wx/volume.h b/interface/wx/volume.h
index 13e140eaf920914a6166ff631e96f91e3a2e4f02..41aeb7335621eadced4be0ba07736008f066ed6b 100644 (file)
--- a/interface/wx/volume.h
+++ b/interface/wx/volume.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxFSVolume
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxFSVolume
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -70,13 +70,13 @@ public:
     /**
         Default ctor. Use Create() later.
     */
     /**
         Default ctor. Use Create() later.
     */

-    wxFSVolumeBase();
+    wxFSVolume();

 
     /**
         Create the volume object with the given @a name (which should be one of
         those returned by GetVolumes()).
     */
 
     /**
         Create the volume object with the given @a name (which should be one of
         those returned by GetVolumes()).
     */

-    wxFSVolumeBase(const wxString& name);
+    wxFSVolume(const wxString& name);

 
     /**
         Create the volume object with the given @a name (which should be one of
 
     /**
         Create the volume object with the given @a name (which should be one of


@@ -90,6 +90,7 @@ public:
         Only the volumes with @e flags such that the expression
         @code (flags & flagsSet) == flagsSet && !(flags & flagsUnset) @endcode
         is @true, are returned. By default, all mounted ones are returned.
         Only the volumes with @e flags such that the expression
         @code (flags & flagsSet) == flagsSet && !(flags & flagsUnset) @endcode
         is @true, are returned. By default, all mounted ones are returned.

+        See ::wxFSVolumeFlags enumeration values for a list of valid flags.

 
         This operation may take a while and, even if this function is
         synchronous, it can be stopped using CancelSearch().
 
         This operation may take a while and, even if this function is
         synchronous, it can be stopped using CancelSearch().


@@ -114,7 +115,7 @@ public:
     wxFSVolumeKind GetKind() const;
 
     /**
     wxFSVolumeKind GetKind() const;
 
     /**

-        Returns the flags of this volume. See wxFSVolumeFlags.
+        Returns the flags of this volume. See ::wxFSVolumeFlags enumeration values.

     */
     int GetFlags() const;
 
     */
     int GetFlags() const;