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

Catching up to new common class interfaces.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-04-05 22:09:25 +00:00
parent 0f5fa11181
commit 3437f881c4
12 changed files with 585 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/os2/listbox.cpp
View File

@@ -281,7 +281,7 @@ int wxListBox::DoAppend(
wxOwnerDrawn* pNewItem = CreateItem(nIndex); // dummy argument
pNewItem->SetName(rsItem);
m_aItems.Add(pNewItem);
m_aItems.Insert(pNewItem, nIndex);
::WinSendMsg(GetHwnd(), LM_SETITEMHANDLE, (MPARAM)((SHORT)nIndex), MPFROMP(pNewItem));
pNewItem->SetFont(GetFont());
}
@@ -331,24 +331,18 @@ void wxListBox::DoSetItems(
//
// First delete old items
//
size_t lUi = m_aItems.Count();
while (lUi-- != 0)
{
delete m_aItems[lUi];
}
m_aItems.Empty();
WX_CLEAR_ARRAY(m_aItems);
//
// Then create new ones
//
for (lUi = 0; lUi < (size_t)m_nNumItems; lUi++)
for (size_t ui = 0; ui < (size_t)m_nNumItems; ui++)
{
wxOwnerDrawn* pNewItem = CreateItem(lUi);
wxOwnerDrawn* pNewItem = CreateItem(ui);
pNewItem->SetName(raChoices[lUi]);
pNewItem->SetName(raChoices[ui]);
m_aItems.Add(pNewItem);
::WinSendMsg(GetHwnd(), LM_SETITEMHANDLE, MPFROMLONG(lUi), MPFROMP(pNewItem));
::WinSendMsg(GetHwnd(), LM_SETITEMHANDLE, MPFROMLONG(ui), MPFROMP(pNewItem));
}
}
#endif // wxUSE_OWNER_DRAWN
@@ -596,8 +590,25 @@ void wxListBox::DoInsertItems(
int nItems = asItems.GetCount();
for (int i = 0; i < nItems; i++)
::WinSendMsg(GetHwnd(), LM_INSERTITEM, MPFROMLONG((LONG)(i + nPos)), (MPARAM)asItems[i].c_str());
m_nNumItems += nItems;
{
int nIndex = (int)::WinSendMsg( GetHwnd()
,LM_INSERTITEM
,MPFROMLONG((LONG)(i + nPos))
,(MPARAM)asItems[i].c_str()
);
wxOwnerDrawn* pNewItem = CreateItem(nIndex);
pNewItem->SetName(asItems[i]);
pNewItem->SetFont(GetFont());
m_aItems.Insert(pNewItem, nIndex);
::WinSendMsg( GetHwnd()
,LM_SETITEMHANDLE
,(MPARAM)((SHORT)nIndex)
,MPFROMP(pNewItem)
);
m_nNumItems += nItems;
}
} // end of wxListBox::DoInsertItems
void wxListBox::SetString(