projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Check validity of wxSizerFlags::Border() direction parameter.
[wxWidgets.git]
/
include
/
wx
/
volume.h
diff --git
a/include/wx/volume.h
b/include/wx/volume.h
index 62406e75917789195b70ea04ad3e6fb159f67732..191d69b603fae2d43f5e9c1bfce6bef923e9221f 100644
(file)
--- a/
include/wx/volume.h
+++ b/
include/wx/volume.h
@@
-10,22
+10,20
@@
/////////////////////////////////////////////////////////////////////////////
// ----------------------------------------------------------------------------
/////////////////////////////////////////////////////////////////////////////
// ----------------------------------------------------------------------------
-// wxFSVolume represents a volume/drive
/mount point
in a file system
+// wxFSVolume represents a volume/drive in a file system
// ----------------------------------------------------------------------------
#ifndef _WX_FSVOLUME_H_
#define _WX_FSVOLUME_H_
// ----------------------------------------------------------------------------
#ifndef _WX_FSVOLUME_H_
#define _WX_FSVOLUME_H_
-#if defined(__GNUG__) && !defined(__APPLE__)
- #pragma interface "fsvolume.h"
-#endif
-
#include "wx/defs.h"
#if wxUSE_FSVOLUME
#include "wx/defs.h"
#if wxUSE_FSVOLUME
+#include "wx/arrstr.h"
+
// the volume flags
// the volume flags
-enum
+enum
wxFSVolumeFlags
{
// is the volume mounted?
wxFS_VOL_MOUNTED = 0x0001,
{
// is the volume mounted?
wxFS_VOL_MOUNTED = 0x0001,
@@
-52,7
+50,7
@@
enum wxFSVolumeKind
wxFS_VOL_MAX
};
wxFS_VOL_MAX
};
-class WXDLL
EXPORT
_BASE wxFSVolumeBase
+class WXDLL
IMPEXP
_BASE wxFSVolumeBase
{
public:
// return the array containing the names of the volumes
{
public:
// return the array containing the names of the volumes
@@
-121,7
+119,7
@@
enum wxFSIconType
};
// wxFSVolume adds GetIcon() to wxFSVolumeBase
};
// wxFSVolume adds GetIcon() to wxFSVolumeBase
-class wxFSVolume : public wxFSVolumeBase
+class
WXDLLIMPEXP_CORE
wxFSVolume : public wxFSVolumeBase
{
public:
wxFSVolume() : wxFSVolumeBase() { InitIcons(); }
{
public:
wxFSVolume() : wxFSVolumeBase() { InitIcons(); }
@@
-139,16
+137,10
@@
private:
#else // !wxUSE_GUI
// wxFSVolume is the same thing as wxFSVolume in wxBase
#else // !wxUSE_GUI
// wxFSVolume is the same thing as wxFSVolume in wxBase
-class wxFSVolume : public wxFSVolumeBase
-{
-public:
- wxFSVolume() : wxFSVolumeBase() { }
- wxFSVolume(const wxString& name) : wxFSVolumeBase(name) { }
-};
+typedef wxFSVolumeBase wxFSVolume;
#endif // wxUSE_GUI/!wxUSE_GUI
#endif // wxUSE_FSVOLUME
#endif // _WX_FSVOLUME_H_
#endif // wxUSE_GUI/!wxUSE_GUI
#endif // wxUSE_FSVOLUME
#endif // _WX_FSVOLUME_H_
-