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

replaced all int/size_t indices in wxControlWithItems API with unsigned int (committing on behalf of ABX)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-03-23 22:05:23 +00:00
parent 5aa67d6619
commit aa61d35253
112 changed files with 1367 additions and 1414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/cocoa/combobox.mm
View File

@@ -255,23 +255,23 @@ void wxComboBox::Clear()
m_Datas.Clear();
}
void wxComboBox::Delete(int nIndex)
void wxComboBox::Delete(unsigned int n)
{
[GetNSComboBox() removeItemAtIndex:nIndex];
m_Datas.RemoveAt(nIndex);
[GetNSComboBox() removeItemAtIndex:n];
m_Datas.RemoveAt(n);
}
size_t wxComboBox::GetCount() const
unsigned int wxComboBox::GetCount() const
{
return (size_t)[GetNSComboBox() numberOfItems];
return (unsigned int)[GetNSComboBox() numberOfItems];
}
wxString wxComboBox::GetString(int nIndex) const
wxString wxComboBox::GetString(unsigned int nIndex) const
{
return wxStringWithNSString([GetNSComboBox() itemObjectValueAtIndex:nIndex]);
}
void wxComboBox::SetString(int nIndex, const wxString& szString)
void wxComboBox::SetString(unsigned int nIndex, const wxString& szString)
{
wxAutoNSAutoreleasePool pool;
//FIXME: There appears to be no "set item data" method - maybe
@@ -299,30 +299,30 @@ int wxComboBox::DoAppend(const wxString& szItem)
return [GetNSComboBox() numberOfItems];
}
int wxComboBox::DoInsert(const wxString& szItem, int nIndex)
int wxComboBox::DoInsert(const wxString& szItem, unsigned int nIndex)
{
m_Datas.Insert(NULL, nIndex);
wxAutoNSAutoreleasePool pool;
[GetNSComboBox() insertItemWithObjectValue:wxNSStringWithWxString(szItem) atIndex:nIndex];
return nIndex;
return (int)nIndex;
}
void wxComboBox::DoSetItemClientData(int nIndex, void* pData)
void wxComboBox::DoSetItemClientData(unsigned int nIndex, void* pData)
{
m_Datas[nIndex] = pData;
}
void* wxComboBox::DoGetItemClientData(int nIndex) const
void* wxComboBox::DoGetItemClientData(unsigned int nIndex) const
{
return m_Datas[nIndex];
}
void wxComboBox::DoSetItemClientObject(int nIndex, wxClientData* pClientData)
void wxComboBox::DoSetItemClientObject(unsigned int nIndex, wxClientData* pClientData)
{
m_Datas[nIndex] = (void*) pClientData;
}
wxClientData* wxComboBox::DoGetItemClientObject(int nIndex) const
wxClientData* wxComboBox::DoGetItemClientObject(unsigned int nIndex) const
{
return (wxClientData*) m_Datas[nIndex];
}