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 4af7870e8db6842b71cfca35ddfc06a2e8c0c4bc..50cd202753ded5e7dd7fe1dd43b168883a9ce000 100644 (file)
--- a/interface/wx/choice.h
+++ b/interface/wx/choice.h
@@ -30,7 +30,8 @@
 
     @see wxListBox, wxComboBox, wxCommandEvent
 */
 
     @see wxListBox, wxComboBox, wxCommandEvent
 */

-class wxChoice : public wxControlWithItems
+class wxChoice : public wxControl,
+                 public wxItemContainer

 {
 public:
     /**
 {
 public:
     /**

diff --git a/interface/wx/listbox.h b/interface/wx/listbox.h
index 8b0ae24efc7e3bb4d22ce72f20b6930baf1998fa..538223e6f470b95add491b7e6f39310d3be02a85 100644 (file)
--- a/interface/wx/listbox.h
+++ b/interface/wx/listbox.h
@@ -71,7 +71,8 @@
 
     @see wxEditableListBox, wxChoice, wxComboBox, wxListCtrl, wxCommandEvent
 */
 
     @see wxEditableListBox, wxChoice, wxComboBox, wxListCtrl, wxCommandEvent
 */

-class wxListBox : public wxControlWithItems
+class wxListBox : public wxControl,
+                  public wxItemContainer

 {
 public:
     /**
 {
 public:
     /**