merged 2.4 branch into the trunk

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions

View File

@@ -73,7 +73,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
class wxCheckListBoxItem : public wxOwnerDrawn
{
friend class wxCheckListBox;
friend class WXDLLEXPORT wxCheckListBox;
public:
// ctor
wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex);
@@ -93,7 +93,7 @@ private:
};
wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex)
: wxOwnerDrawn("", TRUE) // checkable
: wxOwnerDrawn(wxEmptyString, TRUE) // checkable
{
m_bChecked = FALSE;
m_pParent = pParent;
@@ -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;