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

fixed wxBase compilation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-05-24 21:36:41 +00:00
parent 8efab359f7
commit c786f76365
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/unix/mimetype.cpp
View File

@@ -1110,17 +1110,19 @@ wxString wxFileTypeImpl::GetExpandedCommand(const wxString & verb, const wxFileT
return wxFileType::ExpandCommand(sTmp, params); return wxFileType::ExpandCommand(sTmp, params);
} }
bool wxFileTypeImpl::GetIcon(wxIcon *icon, wxString *iconFile /*= NULL */, bool wxFileTypeImpl::GetIcon(wxIcon *icon,
int *iconIndex /*= NULL*/) const wxString *iconFile /*= NULL */,
int *iconIndex /*= NULL*/) const
{ {
#if wxUSE_GUI
wxString sTmp; wxString sTmp;
size_t i = 0; size_t i = 0;
while ( (i < m_index.GetCount() ) && sTmp.IsEmpty() ) while ( (i < m_index.GetCount() ) && sTmp.IsEmpty() )
{ {
sTmp = m_manager->m_aIcons[m_index[i]]; sTmp = m_manager->m_aIcons[m_index[i]];
i ++; i ++;
} }
if ( sTmp.IsEmpty () ) return FALSE; if ( sTmp.IsEmpty () ) return FALSE;
wxIcon icn; wxIcon icn;
@@ -1131,14 +1133,16 @@ bool wxFileTypeImpl::GetIcon(wxIcon *icon, wxString *iconFile /*= NULL */,
icn = wxIcon(sTmp, wxBITMAP_TYPE_ANY); icn = wxIcon(sTmp, wxBITMAP_TYPE_ANY);
if ( icn.Ok() ) if ( icn.Ok() )
{ {
*icon = icn; *icon = icn;
if (iconFile) *iconFile = sTmp; if (iconFile) *iconFile = sTmp;
if (iconIndex) *iconIndex = 0; if (iconIndex) *iconIndex = 0;
return TRUE; return TRUE;
}
return FALSE;
} }
#endif // wxUSE_GUI
return FALSE;
}
bool bool