X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4aebbc599eef4270d7e8bc8ce40e6ac30baafdb4..1e52188741389278cd99abf79218162c87024ba3:/src/msw/volume.cpp diff --git a/src/msw/volume.cpp b/src/msw/volume.cpp index df62ac3e97..2b4f329138 100644 --- a/src/msw/volume.cpp +++ b/src/msw/volume.cpp @@ -6,7 +6,7 @@ // Created: 28 Jan 02 // RCS-ID: $Id$ // Copyright: (c) 2002 George Policello -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "fsvolume.h" #endif @@ -30,7 +30,9 @@ #if wxUSE_FSVOLUME #ifndef WX_PRECOMP - #include "wx/icon.h" + #if wxUSE_GUI + #include "wx/icon.h" + #endif #include "wx/intl.h" #endif // WX_PRECOMP @@ -41,40 +43,10 @@ #include "wx/volume.h" -// Win32 headers -#include +#include +#include "wx/msw/missing.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 +#if wxUSE_BASE //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ // Dynamic library function defs. @@ -95,22 +67,31 @@ static WNetCloseEnumPtr s_pWNetCloseEnum; //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ static long s_cancelSearch = FALSE; -struct FileInfo : public wxObject +struct FileInfo { 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; }; WX_DECLARE_STRING_HASH_MAP(FileInfo, FileInfoMap); -static FileInfoMap s_fileInfo(25); +// Cygwin bug (?) destructor for global s_fileInfo is called twice... +static FileInfoMap& GetFileInfoMap() +{ + static FileInfoMap s_fileInfo(25); -//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -// Other initialization. -//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -#if wxUSE_GUI -WX_DEFINE_OBJARRAY(wxIconArray); -#endif + return s_fileInfo; +} +#define s_fileInfo (GetFileInfoMap()) //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ // Local helper functions. @@ -308,9 +289,9 @@ static void BuildListFromNN(wxArrayString& list, NETRESOURCE* pResSrc, // Function: CompareFcn // Purpose: Used to sort the NN list alphabetically, case insensitive. //============================================================================= -static int CompareFcn(const wxString& first, const wxString& second) +static int CompareFcn(wxString* first, wxString* second) { - return wxStricmp(first.c_str(), second.c_str()); + return wxStricmp(first->c_str(), second->c_str()); } // CompareFcn //============================================================================= @@ -375,7 +356,7 @@ static bool BuildRemoteList(wxArrayString& list, NETRESOURCE* pResSrc, { // Found the element. Remove it or mark it mounted. if (flagsUnset & wxFS_VOL_MOUNTED) - list.Remove(iList); + list.RemoveAt(iList); else s_fileInfo[list[iList]].m_flags |= wxFS_VOL_MOUNTED; @@ -397,7 +378,7 @@ static bool BuildRemoteList(wxArrayString& list, NETRESOURCE* pResSrc, // Purpose: Generate and return a list of all volumes (drives) available. // Notes: //============================================================================= -wxArrayString wxFSVolume::GetVolumes(int flagsSet, int flagsUnset) +wxArrayString wxFSVolumeBase::GetVolumes(int flagsSet, int flagsUnset) { InterlockedExchange(&s_cancelSearch, FALSE); // reset @@ -405,7 +386,7 @@ wxArrayString wxFSVolume::GetVolumes(int flagsSet, int flagsUnset) { #ifdef UNICODE s_pWNetOpenEnum = (WNetOpenEnumPtr)s_mprLib.GetSymbol(_T("WNetOpenEnumW")); - s_pWNetEnumResource = (WNetEnumResourcePtr)s_mprLib.GetSymbol("WNetEnumResourceW"); + s_pWNetEnumResource = (WNetEnumResourcePtr)s_mprLib.GetSymbol(_T("WNetEnumResourceW")); #else s_pWNetOpenEnum = (WNetOpenEnumPtr)s_mprLib.GetSymbol(_T("WNetOpenEnumA")); s_pWNetEnumResource = (WNetEnumResourcePtr)s_mprLib.GetSymbol(_T("WNetEnumResourceA")); @@ -466,7 +447,7 @@ wxArrayString wxFSVolume::GetVolumes(int flagsSet, int flagsUnset) // performing the search. This is the only thread-safe function // provided by the class. //============================================================================= -void wxFSVolume::CancelSearch() +void wxFSVolumeBase::CancelSearch() { InterlockedExchange(&s_cancelSearch, TRUE); } // CancelSearch @@ -475,7 +456,7 @@ void wxFSVolume::CancelSearch() // Function: constructor // Purpose: default constructor //============================================================================= -wxFSVolume::wxFSVolume() +wxFSVolumeBase::wxFSVolumeBase() { m_isOk = FALSE; } // wxVolume @@ -484,7 +465,7 @@ wxFSVolume::wxFSVolume() // Function: constructor // Purpose: constructor that calls Create //============================================================================= -wxFSVolume::wxFSVolume(const wxString& name) +wxFSVolumeBase::wxFSVolumeBase(const wxString& name) { Create(name); } // wxVolume @@ -493,7 +474,7 @@ wxFSVolume::wxFSVolume(const wxString& name) // Function: Create // Purpose: Finds, logs in, etc. to the request volume. //============================================================================= -bool wxFSVolume::Create(const wxString& name) +bool wxFSVolumeBase::Create(const wxString& name) { // assume fail. m_isOk = FALSE; @@ -511,16 +492,6 @@ bool wxFSVolume::Create(const wxString& name) } m_dispName = fi.szDisplayName; -#if wxUSE_GUI - - m_icons.Alloc(wxFS_VOL_ICO_MAX); - int idx; - wxIcon null; - for (idx = 0; idx < wxFS_VOL_ICO_MAX; idx++) - m_icons.Add(null); - -#endif - // all tests passed. return m_isOk = TRUE; } // Create @@ -531,7 +502,7 @@ bool wxFSVolume::Create(const wxString& name) // Notes: For fixed disks, it must exist. For removable disks, it must also // be present. For Network Shares, it must also be logged in, etc. //============================================================================= -bool wxFSVolume::IsOk() const +bool wxFSVolumeBase::IsOk() const { return m_isOk; } // IsOk @@ -540,7 +511,7 @@ bool wxFSVolume::IsOk() const // Function: GetKind // Purpose: Return the type of the volume. //============================================================================= -wxFSVolumeKind wxFSVolume::GetKind() const +wxFSVolumeKind wxFSVolumeBase::GetKind() const { if (!m_isOk) return wxFS_VOL_OTHER; @@ -557,7 +528,7 @@ wxFSVolumeKind wxFSVolume::GetKind() const // Purpose: Return the caches flags for this volume. // Notes: - Returns -1 if no flags were cached. //============================================================================= -int wxFSVolume::GetFlags() const +int wxFSVolumeBase::GetFlags() const { if (!m_isOk) return -1; @@ -569,40 +540,52 @@ int wxFSVolume::GetFlags() const return itr->second.m_flags; } // GetFlags +#endif // wxUSE_BASE + +// ============================================================================ +// wxFSVolume +// ============================================================================ + #if wxUSE_GUI +void wxFSVolume::InitIcons() +{ + m_icons.Alloc(wxFS_VOL_ICO_MAX); + wxIcon null; + for (int idx = 0; idx < wxFS_VOL_ICO_MAX; idx++) + m_icons.Add(null); +} + //============================================================================= // Function: GetIcon // Purpose: return the requested icon. //============================================================================= + wxIcon wxFSVolume::GetIcon(wxFSIconType type) const { - 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") ); + wxCHECK_MSG( type >= 0 && (size_t)type < m_icons.GetCount(), wxNullIcon, + _T("wxFSIconType::GetIcon(): invalid icon index") ); // Load on demand. if (m_icons[type].IsNull()) { - unsigned flags = 0; + UINT flags = SHGFI_ICON; switch (type) { case wxFS_VOL_ICO_SMALL: - flags = SHGFI_ICON | SHGFI_SMALLICON; + flags |= SHGFI_SMALLICON; break; case wxFS_VOL_ICO_LARGE: - flags = SHGFI_ICON | SHGFI_SHELLICONSIZE; + flags |= SHGFI_SHELLICONSIZE; break; case wxFS_VOL_ICO_SEL_SMALL: - flags = SHGFI_ICON | SHGFI_SMALLICON | SHGFI_OPENICON; + flags |= SHGFI_SMALLICON | SHGFI_OPENICON; break; case wxFS_VOL_ICO_SEL_LARGE: - flags = SHGFI_ICON | SHGFI_SHELLICONSIZE | SHGFI_OPENICON; + flags |= SHGFI_SHELLICONSIZE | SHGFI_OPENICON; break; case wxFS_VOL_ICO_MAX: