From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 28 Dec 2012 00:44:05 +0000 (+0000)
Subject: Document wxListBox and wxChoice as inheriting from wxItemContainer.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3bb9348f9394c3e283ef93d743f7309dc4c4d708?ds=inline

Document wxListBox and wxChoice as inheriting from wxItemContainer.

Due to an apparent Doxygen bug, methods inherited from wxItemContainer via
wxControlWithItems didn't appear in the documentation, so work around this by
using wxItemContainer as a direct base class.

Closes #14882.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/interface/wx/choice.h b/interface/wx/choice.h
index 4af7870e8d..50cd202753 100644
--- a/interface/wx/choice.h
+++ b/interface/wx/choice.h
@@ -30,7 +30,8 @@
 
     @see wxListBox, wxComboBox, wxCommandEvent
 */
-class wxChoice : public wxControlWithItems
+class wxChoice : public wxControl,
+                 public wxItemContainer
 {
 public:
     /**
diff --git a/interface/wx/listbox.h b/interface/wx/listbox.h
index 8b0ae24efc..538223e6f4 100644
--- a/interface/wx/listbox.h
+++ b/interface/wx/listbox.h
@@ -71,7 +71,8 @@
 
     @see wxEditableListBox, wxChoice, wxComboBox, wxListCtrl, wxCommandEvent
 */
-class wxListBox : public wxControlWithItems
+class wxListBox : public wxControl,
+                  public wxItemContainer
 {
 public:
     /**