4.30 beta

This commit is contained in:
Igor Pavlov
2005-11-18 00:00:00 +00:00
committed by Kornel Lesiński
parent bcd1db2f5a
commit e18587ba51
214 changed files with 5385 additions and 2712 deletions

View File

@@ -7,9 +7,9 @@
struct CExtIconPair
{
CSysString Ext;
UString Ext;
int IconIndex;
CSysString TypeName;
UString TypeName;
};
@@ -26,9 +26,9 @@ inline bool operator<(const CExtIconPair &a1, const CExtIconPair &a2)
class CExtToIconMap
{
int _dirIconIndex;
CSysString _dirTypeName;
UString _dirTypeName;
int _noExtIconIndex;
CSysString _noExtTypeName;
UString _noExtTypeName;
CObjectVector<CExtIconPair> _map;
public:
CExtToIconMap(): _dirIconIndex(-1), _noExtIconIndex(-1) {}
@@ -38,16 +38,14 @@ public:
_noExtIconIndex = -1;
_map.Clear();
}
int GetIconIndex(UINT32 attributes, const CSysString &fileName,
CSysString &typeName);
int GetIconIndex(UINT32 attributes, const CSysString &fileName);
int GetIconIndex(UINT32 attributes, const UString &fileName, UString &typeName);
int GetIconIndex(UINT32 attributes, const UString &fileName);
};
DWORD_PTR GetRealIconIndex(LPCTSTR path, UINT32 attributes, int &iconIndex);
#ifndef _UNICODE
// DWORD_PTR GetRealIconIndex(LPCWSTR path, UINT32 attributes, int &iconIndex);
DWORD_PTR GetRealIconIndex(LPCWSTR path, UINT32 attributes, int &iconIndex);
#endif
DWORD_PTR GetRealIconIndex(const CSysString &fileName, UINT32 attributes, int &iconIndex, CSysString &typeName);
int GetIconIndexForCSIDL(int aCSIDL);
#endif