#pragma hdrstop
#endif
+#if wxUSE_FSVOLUME
+
#ifndef WX_PRECOMP
+ #include "wx/icon.h"
+ #include "wx/intl.h"
#endif // WX_PRECOMP
#include "wx/dir.h"
// Win32 headers
#include <shlobj.h>
+#ifndef SHGFI_ATTRIBUTES
+ #define SHGFI_ATTRIBUTES 2048
+#endif
+
+#ifndef SFGAO_READONLY
+ #define SFGAO_READONLY 0x00040000L
+#endif
+
+#ifndef SFGAO_REMOVABLE
+ #define SFGAO_REMOVABLE 0x02000000L
+#endif
+
+#ifndef SHGFI_DISPLAYNAME
+ #define SHGFI_DISPLAYNAME 512
+#endif
+
+#ifndef SHGFI_ICON
+ #define SHGFI_ICON 256
+#endif
+
+#ifndef SHGFI_SMALLICON
+ #define SHGFI_SMALLICON 1
+#endif
+
+#ifndef SHGFI_SHELLICONSIZE
+ #define SHGFI_SHELLICONSIZE 4
+#endif
+
+#ifndef SHGFI_OPENICON
+ #define SHGFI_OPENICON 2
+#endif
+
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
// Dynamic library function defs.
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
{
FileInfo(unsigned flag=0, wxFSVolumeKind type=wxFS_VOL_OTHER) :
m_flags(flag), m_type(type) {}
+
+ FileInfo(const FileInfo& other) { *this = other; }
+ FileInfo& operator=(const FileInfo& other)
+ {
+ m_flags = other.m_flags;
+ m_type = other.m_type;
+ return *this;
+ }
+
unsigned m_flags;
wxFSVolumeKind m_type;
};
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
// Other initialization.
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-WX_DEFINE_OBJARRAY(wxIconArray);
+#if wxUSE_GUI
+// already in wx/iconbndl.h
+// WX_DEFINE_OBJARRAY(wxIconArray);
+#endif
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
// Local helper functions.
// - Other flags are 'best guess' from type of drive. The system will
// not report the file attributes with any degree of accuracy.
//=============================================================================
-unsigned GetBasicFlags(const char* filename)
+static unsigned GetBasicFlags(const wxChar* filename)
{
unsigned flags = wxFS_VOL_MOUNTED;
// Purpose: Add a file to the list if it meets the filter requirement.
// Notes: - See GetBasicFlags for remarks about the Mounted flag.
//=============================================================================
-bool FilteredAdd(wxArrayString& list, const char* filename, unsigned flagsSet, unsigned flagsUnset)
+static bool FilteredAdd(wxArrayString& list, const wxChar* filename,
+ unsigned flagsSet, unsigned flagsUnset)
{
bool accept = TRUE;
unsigned flags = GetBasicFlags(filename);
// all items while determining which are connected and not. So this
// function will find either all items or connected items.
//=============================================================================
-void BuildListFromNN(wxArrayString& list, NETRESOURCE* pResSrc, unsigned flagsSet, unsigned flagsUnset)
+static void BuildListFromNN(wxArrayString& list, NETRESOURCE* pResSrc,
+ unsigned flagsSet, unsigned flagsUnset)
{
HANDLE hEnum;
int rc;
//----------------------------------------------------------------------
if (rc = s_pWNetOpenEnum(scope, RESOURCETYPE_DISK, 0, pResSrc, &hEnum), rc == NO_ERROR)
{
- unsigned long count = 1;
- unsigned long size = 256;
+ DWORD count = 1;
+ DWORD size = 256;
NETRESOURCE* pRes = (NETRESOURCE*)malloc(size);
memset(pRes, 0, sizeof(NETRESOURCE));
while (rc = s_pWNetEnumResource(hEnum, &count, pRes, &size), rc == NO_ERROR || rc == ERROR_MORE_DATA)
//=============================================================================
static int CompareFcn(const wxString& first, const wxString& second)
{
- return stricmp(first.c_str(), second.c_str());
+ return wxStricmp(first.c_str(), second.c_str());
} // CompareFcn
//=============================================================================
// way manually.
// - The resulting list is sorted alphabetically.
//=============================================================================
-bool BuildRemoteList(wxArrayString& list, NETRESOURCE* pResSrc, unsigned flagsSet, unsigned flagsUnset)
+static bool BuildRemoteList(wxArrayString& list, NETRESOURCE* pResSrc,
+ unsigned flagsSet, unsigned flagsUnset)
{
// NN query depends on dynamically loaded library.
if (!s_pWNetOpenEnum || !s_pWNetEnumResource || !s_pWNetCloseEnum)
wxString all(list[iList]);
wxString mount(mounted[iMounted]);
- while (compare = stricmp(list[iList], mounted[iMounted]), compare > 0 && iList >= 0)
+ while (compare =
+ wxStricmp(list[iList].c_str(), mounted[iMounted].c_str()),
+ compare > 0 && iList >= 0)
{
iList--;
all = list[iList];
while (*pVol)
{
FilteredAdd(list, pVol, flagsSet, flagsUnset);
- pVol = pVol + _tcslen(pVol) + 1;
+ pVol = pVol + wxStrlen(pVol) + 1;
}
// Cleanup.
wxArrayString nn;
if (BuildRemoteList(nn, 0, flagsSet, flagsUnset))
{
- int idx;
- for (idx = 0; idx < nn.GetCount(); idx++)
+ for (size_t idx = 0; idx < nn.GetCount(); idx++)
list.Add(nn[idx]);
}
}
long rc = SHGetFileInfo(m_volName, 0, &fi, sizeof(fi), SHGFI_DISPLAYNAME);
if (!rc)
{
- wxLogError(_("Cannot read typename from '%s'!"), m_volName);
+ wxLogError(_("Cannot read typename from '%s'!"), m_volName.c_str());
return m_isOk;
}
m_dispName = fi.szDisplayName;
-#ifdef wxUSE_GUI
+#if wxUSE_GUI
m_icons.Alloc(wxFS_VOL_ICO_MAX);
int idx;
return itr->second.m_flags;
} // GetFlags
-#ifdef wxUSE_GUI
+#if wxUSE_GUI
//=============================================================================
// Function: GetIcon
//=============================================================================
wxIcon wxFSVolume::GetIcon(wxFSIconType type) const
{
- wxASSERT(type < m_icons.GetCount());
-
- if (type >= m_icons.GetCount())
- {
- wxLogError(_("Invalid request for icon type!"));
- wxIcon null;
- return null;
- }
+ wxCHECK_MSG(type < (int)m_icons.GetCount(), wxNullIcon,
+ _T("Invalid request for icon type!"));
+ wxCHECK_MSG( type >= 0 && (size_t)type < m_icons.GetCount(),
+ wxIcon(),
+ _T("invalid icon index") );
// Load on demand.
if (m_icons[type].IsNull())
case wxFS_VOL_ICO_SEL_LARGE:
flags = SHGFI_ICON | SHGFI_SHELLICONSIZE | SHGFI_OPENICON;
break;
+
+ case wxFS_VOL_ICO_MAX:
+ wxFAIL_MSG(_T("wxFS_VOL_ICO_MAX is not valid icon type"));
+ break;
}
SHFILEINFO fi;
long rc = SHGetFileInfo(m_volName, 0, &fi, sizeof(fi), flags);
m_icons[type].SetHICON((WXHICON)fi.hIcon);
if (!rc || !fi.hIcon)
- wxLogError(_("Cannot load icon from '%s'."), m_volName);
+ wxLogError(_("Cannot load icon from '%s'."), m_volName.c_str());
}
return m_icons[type];
#endif // wxUSE_GUI
+#endif // wxUSE_FSVOLUME
+
projects / wxWidgets.git / blobdiff