Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unicode fixes and warnings cleanup

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-02-17 23:34:51 +00:00
parent cb7acf9cc7
commit 4d90b8de01
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/msw/volume.cpp
View File

@@ -89,7 +89,7 @@ WX_DEFINE_OBJARRAY(wxIconArray);
// - Other flags are 'best guess' from type of drive. The system will // - Other flags are 'best guess' from type of drive. The system will
// not report the file attributes with any degree of accuracy. // 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; unsigned flags = wxFS_VOL_MOUNTED;
@@ -162,7 +162,8 @@ unsigned GetBasicFlags(const char* filename)
// Purpose: Add a file to the list if it meets the filter requirement. // Purpose: Add a file to the list if it meets the filter requirement.
// Notes: - See GetBasicFlags for remarks about the Mounted flag. // 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; bool accept = TRUE;
unsigned flags = GetBasicFlags(filename); unsigned flags = GetBasicFlags(filename);
@@ -198,7 +199,8 @@ bool FilteredAdd(wxArrayString& list, const char* filename, unsigned flagsSet, u
// all items while determining which are connected and not. So this // all items while determining which are connected and not. So this
// function will find either all items or connected items. // 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; HANDLE hEnum;
int rc; int rc;
@@ -272,7 +274,7 @@ void BuildListFromNN(wxArrayString& list, NETRESOURCE* pResSrc, unsigned flagsSe
//============================================================================= //=============================================================================
static int CompareFcn(const wxString& first, const wxString& second) 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 } // CompareFcn
//============================================================================= //=============================================================================
@@ -283,7 +285,8 @@ static int CompareFcn(const wxString& first, const wxString& second)
// way manually. // way manually.
// - The resulting list is sorted alphabetically. // - 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. // NN query depends on dynamically loaded library.
if (!s_pWNetOpenEnum || !s_pWNetEnumResource || !s_pWNetCloseEnum) if (!s_pWNetOpenEnum || !s_pWNetEnumResource || !s_pWNetCloseEnum)
@@ -323,7 +326,9 @@ bool BuildRemoteList(wxArrayString& list, NETRESOURCE* pResSrc, unsigned flagsSe
wxString all(list[iList]); wxString all(list[iList]);
wxString mount(mounted[iMounted]); 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--; iList--;
all = list[iList]; all = list[iList];
@@ -465,7 +470,7 @@ bool wxFSVolume::Create(const wxString& name)
long rc = SHGetFileInfo(m_volName, 0, &fi, sizeof(fi), SHGFI_DISPLAYNAME); long rc = SHGetFileInfo(m_volName, 0, &fi, sizeof(fi), SHGFI_DISPLAYNAME);
if (!rc) if (!rc)
{ {
wxLogError(_("Cannot read typename from '%s'!"), m_volName); wxLogError(_("Cannot read typename from '%s'!"), m_volName.c_str());
return m_isOk; return m_isOk;
} }
m_dispName = fi.szDisplayName; m_dispName = fi.szDisplayName;
@@ -536,6 +541,8 @@ int wxFSVolume::GetFlags() const
//============================================================================= //=============================================================================
wxIcon wxFSVolume::GetIcon(wxFSIconType type) 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(), wxCHECK_MSG( type >= 0 && (size_t)type < m_icons.GetCount(),
wxIcon(), wxIcon(),
_T("invalid icon index") ); _T("invalid icon index") );
@@ -561,13 +568,17 @@ wxIcon wxFSVolume::GetIcon(wxFSIconType type) const
case wxFS_VOL_ICO_SEL_LARGE: case wxFS_VOL_ICO_SEL_LARGE:
flags = SHGFI_ICON | SHGFI_SHELLICONSIZE | SHGFI_OPENICON; flags = SHGFI_ICON | SHGFI_SHELLICONSIZE | SHGFI_OPENICON;
break; break;
case wxFS_VOL_ICO_MAX:
wxFAIL_MSG(_T("wxFS_VOL_ICO_MAX is not valid icon type"));
break;
} }
SHFILEINFO fi; SHFILEINFO fi;
long rc = SHGetFileInfo(m_volName, 0, &fi, sizeof(fi), flags); long rc = SHGetFileInfo(m_volName, 0, &fi, sizeof(fi), flags);
m_icons[type].SetHICON((WXHICON)fi.hIcon); m_icons[type].SetHICON((WXHICON)fi.hIcon);
if (!rc || !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]; return m_icons[type];