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

compilation fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-07-09 12:21:43 +00:00
parent 1629fb3b72
commit e9d9f136ee
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/dynarray.cpp
View File

@@ -212,7 +212,7 @@ int wxBaseArray::Index(long lItem, CMPFUNC fnCompare) const
{ {
size_t n = IndexForInsert(lItem, fnCompare); size_t n = IndexForInsert(lItem, fnCompare);
return n < m_nCount && m_pItems[n] == lItem ? n : wxNOT_FOUND; return n < m_nCount && m_pItems[n] == lItem ? (int)n : wxNOT_FOUND;
} }
// add item at the end // add item at the end

3
src/generic/listctrl.cpp
View File

@@ -3567,6 +3567,8 @@ void wxListMainWindow::RecalculatePositions()
GetScrollPos(wxVERTICAL), GetScrollPos(wxVERTICAL),
TRUE ); TRUE );
// FIXME: wxGTK::wxScrolledWindow doesn't have SetTargetRect()
#if !defined(__WXGTK__) || defined(__WXUNIVERSAL__)
// we must have an integer number of lines on screen and so we fit // we must have an integer number of lines on screen and so we fit
// the real control size to the line height // the real control size to the line height
wxRect rect; wxRect rect;
@@ -3575,6 +3577,7 @@ void wxListMainWindow::RecalculatePositions()
rect.width = clientWidth; rect.width = clientWidth;
rect.height = ((clientHeight - LINE_SPACING) / lineHeight)*lineHeight; rect.height = ((clientHeight - LINE_SPACING) / lineHeight)*lineHeight;
SetTargetRect(rect); SetTargetRect(rect);
#endif
} }
else // !report else // !report
{ {

10
src/unix/mimetype.cpp
View File

@@ -2531,11 +2531,11 @@ bool wxMimeTypesManagerImpl::Unassociate(wxFileType *ft)
else else
{ {
WriteMimeInfo(nIndex, TRUE ); WriteMimeInfo(nIndex, TRUE );
m_aTypes.Remove (nIndex); m_aTypes.RemoveAt(nIndex);
m_aEntries.Remove (nIndex); m_aEntries.RemoveAt(nIndex);
m_aExtensions.Remove (nIndex); m_aExtensions.RemoveAt(nIndex);
m_aDescriptions.Remove (nIndex); m_aDescriptions.RemoveAt(nIndex);
m_aIcons.Remove (nIndex); m_aIcons.RemoveAt(nIndex);
} }
} }
// check data integrity // check data integrity