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

renamed wxListBox::CreateItem() to CreateLboxItem() to aviod conflict with wxWindow method

Browse Source 
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:
Vadim Zeitlin
2002-09-22 21:02:00 +00:00
parent c1094350b3
commit 34a8dbd28e
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/checklst.h
View File

@@ -64,7 +64,7 @@ public:
protected: protected:
// we create our items ourselves and they have non-standard size, // we create our items ourselves and they have non-standard size,
// so we need to override these functions // so we need to override these functions
virtual wxOwnerDrawn *CreateItem(size_t n); virtual wxOwnerDrawn *CreateLboxItem(size_t n);
virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item); virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
// this can't be called DoHitTest() because wxWindow already has this method // this can't be called DoHitTest() because wxWindow already has this method

2
include/wx/msw/listbox.h
View File

@@ -95,7 +95,7 @@ public:
bool MSWOnDraw(WXDRAWITEMSTRUCT *item); bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
// plug-in for derived classes // 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 // allows to get the item and use SetXXX functions to set it's appearance
wxOwnerDrawn *GetItem(size_t n) const { return m_aItems[n]; } wxOwnerDrawn *GetItem(size_t n) const { return m_aItems[n]; }

2
src/msw/checklst.cpp
View File

@@ -329,7 +329,7 @@ bool wxCheckListBox::SetFont( const wxFont &font )
// -------------------- // --------------------
// create a check list box item // create a check list box item
wxOwnerDrawn *wxCheckListBox::CreateItem(size_t nIndex) wxOwnerDrawn *wxCheckListBox::CreateLboxItem(size_t nIndex)
{ {
wxCheckListBoxItem *pItem = new wxCheckListBoxItem(this, nIndex); wxCheckListBoxItem *pItem = new wxCheckListBoxItem(this, nIndex);
return pItem; return pItem;

2
src/msw/listbox.cpp
View File

@@ -102,7 +102,7 @@ wxListBoxItem::wxListBoxItem(const wxString& str) : wxOwnerDrawn(str, FALSE)
SetMarginWidth(0); SetMarginWidth(0);
} }
wxOwnerDrawn *wxListBox::CreateItem(size_t WXUNUSED(n)) wxOwnerDrawn *wxListBox::CreateLboxItem(size_t WXUNUSED(n))
{ {
return new wxListBoxItem(); return new wxListBoxItem();
} }