Fixed problem in InsertItems of always adding ownerdraw data even when

[wxWidgets.git] / src / msw / volume.cpp

diff --git a/src/msw/volume.cpp b/src/msw/volume.cpp
index dacb7542a257fcbf07ec5482231c0da8f2684e78..5a3ad4e44086e81f0fa92cd18d1640b33452ab04 100644 (file)
--- a/src/msw/volume.cpp
+++ b/src/msw/volume.cpp
@@ -27,9 +27,11 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_FSVOLUME
+
 #ifndef WX_PRECOMP
-#include <wx/icon.h>
-#include <wx/intl.h>
+    #include "wx/icon.h"
+    #include "wx/intl.h"
 #endif // WX_PRECOMP
 
 #include "wx/dir.h"
@@ -42,6 +44,38 @@
 // 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.
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -74,7 +108,10 @@ static FileInfoMap s_fileInfo(25);
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 // Other initialization.
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-WX_DEFINE_OBJARRAY(wxIconArray);
+#if wxUSE_GUI
+// already in wx/iconbndl.h
+// WX_DEFINE_OBJARRAY(wxIconArray);
+#endif
 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 // Local helper functions.
@@ -89,7 +126,7 @@ WX_DEFINE_OBJARRAY(wxIconArray);
 //        - 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;
 
@@ -162,7 +199,8 @@ unsigned GetBasicFlags(const char* filename)
 // 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);
@@ -198,7 +236,8 @@ bool FilteredAdd(wxArrayString& list, const char* filename, unsigned flagsSet, u
 //          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;
@@ -217,8 +256,8 @@ void BuildListFromNN(wxArrayString& list, NETRESOURCE* pResSrc, unsigned flagsSe
     //----------------------------------------------------------------------
     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)
@@ -272,7 +311,7 @@ void BuildListFromNN(wxArrayString& list, NETRESOURCE* pResSrc, unsigned flagsSe
 //=============================================================================
 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
 
 //=============================================================================
@@ -283,7 +322,8 @@ static int CompareFcn(const wxString& first, const wxString& second)
 //          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)
@@ -323,7 +363,9 @@ bool BuildRemoteList(wxArrayString& list, NETRESOURCE* pResSrc, unsigned flagsSe
             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];
@@ -465,12 +507,12 @@ bool wxFSVolume::Create(const wxString& name)
     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;
@@ -528,7 +570,7 @@ int wxFSVolume::GetFlags() const
     return itr->second.m_flags;
 } // GetFlags
 
-#ifdef wxUSE_GUI
+#if wxUSE_GUI
 
 //=============================================================================
 // Function: GetIcon
@@ -536,6 +578,8 @@ int wxFSVolume::GetFlags() const
 //=============================================================================
 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") );
@@ -561,13 +605,17 @@ wxIcon wxFSVolume::GetIcon(wxFSIconType type) const
         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];
@@ -575,3 +623,5 @@ wxIcon wxFSVolume::GetIcon(wxFSIconType type) const
 
 #endif // wxUSE_GUI
 
+#endif // wxUSE_FSVOLUME
+