renamed wxListBox::CreateItem() to CreateLboxItem() to aviod conflict with wxWindow method
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -64,7 +64,7 @@ public:
|
||||
protected:
|
||||
// we create our items ourselves and they have non-standard size,
|
||||
// so we need to override these functions
|
||||
virtual wxOwnerDrawn *CreateItem(size_t n);
|
||||
virtual wxOwnerDrawn *CreateLboxItem(size_t n);
|
||||
virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
|
||||
|
||||
// this can't be called DoHitTest() because wxWindow already has this method
|
||||
|
@@ -95,7 +95,7 @@ public:
|
||||
bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
|
||||
|
||||
// plug-in for derived classes
|
||||
virtual wxOwnerDrawn *CreateItem(size_t n);
|
||||
virtual wxOwnerDrawn *CreateLboxItem(size_t n);
|
||||
|
||||
// allows to get the item and use SetXXX functions to set it's appearance
|
||||
wxOwnerDrawn *GetItem(size_t n) const { return m_aItems[n]; }
|
||||
|
@@ -329,7 +329,7 @@ bool wxCheckListBox::SetFont( const wxFont &font )
|
||||
// --------------------
|
||||
|
||||
// create a check list box item
|
||||
wxOwnerDrawn *wxCheckListBox::CreateItem(size_t nIndex)
|
||||
wxOwnerDrawn *wxCheckListBox::CreateLboxItem(size_t nIndex)
|
||||
{
|
||||
wxCheckListBoxItem *pItem = new wxCheckListBoxItem(this, nIndex);
|
||||
return pItem;
|
||||
|
@@ -102,7 +102,7 @@ wxListBoxItem::wxListBoxItem(const wxString& str) : wxOwnerDrawn(str, FALSE)
|
||||
SetMarginWidth(0);
|
||||
}
|
||||
|
||||
wxOwnerDrawn *wxListBox::CreateItem(size_t WXUNUSED(n))
|
||||
wxOwnerDrawn *wxListBox::CreateLboxItem(size_t WXUNUSED(n))
|
||||
{
|
||||
return new wxListBoxItem();
|
||||
}
|
||||
|
Reference in New Issue
Block a user