From 34a8dbd28e7c1682d169b2467517e4db1bb05e60 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 22 Sep 2002 21:02:00 +0000 Subject: [PATCH] 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 --- include/wx/msw/checklst.h | 2 +- include/wx/msw/listbox.h | 2 +- src/msw/checklst.cpp | 2 +- src/msw/listbox.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wx/msw/checklst.h b/include/wx/msw/checklst.h index 7b7db054e4..ffc70a0a51 100644 --- a/include/wx/msw/checklst.h +++ b/include/wx/msw/checklst.h @@ -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 diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h index 0021cc304f..0c5161b91f 100644 --- a/include/wx/msw/listbox.h +++ b/include/wx/msw/listbox.h @@ -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]; } diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp index 8f1f3707a2..f35eed0ffc 100644 --- a/src/msw/checklst.cpp +++ b/src/msw/checklst.cpp @@ -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; diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp index 2eeafd8a78..2c31ee8f3a 100644 --- a/src/msw/listbox.cpp +++ b/src/msw/listbox.cpp @@ -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(); }