From b3c33d35d3749e74bde2eb00faefbe3f5dc7e4aa Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Mon, 5 Jun 2006 20:37:57 +0000 Subject: [PATCH] Peaceful solution to wxCheckListBox inheritance in WinCE and wxListBox::Clear() ambiguity in wxUniv. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/widgets/listbox.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/samples/widgets/listbox.cpp b/samples/widgets/listbox.cpp index 82e6021245..1bbd3faa46 100644 --- a/samples/widgets/listbox.cpp +++ b/samples/widgets/listbox.cpp @@ -142,7 +142,13 @@ protected: *m_chkOwnerDraw; // the listbox itself and the sizer it is in - wxListBoxBase *m_lbox; +#ifdef __WXWINCE__ + wxListBoxBase +#else + wxListBox +#endif + *m_lbox; + wxSizer *m_sizerLbox; // the text entries for "Add/change string" and "Delete" buttons @@ -216,7 +222,7 @@ ListboxWidgetsPage::ListboxWidgetsPage(WidgetsBookCtrl *book, m_chkSort = m_chkOwnerDraw = (wxCheckBox *)NULL; - m_lbox = (wxListBoxBase *)NULL; + m_lbox = NULL; m_sizerLbox = (wxSizer *)NULL; /* -- 2.45.2