From 37788684ba0dfe52d3b4f67e5c2dae521893bfff Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 4 Jan 2011 14:13:29 +0000 Subject: [PATCH] Use wxControl instead of wxControlWithItems with wxRTTI macros. wxControlWithItems is just a convenient combination of wxControl and wxItemContainer mix-in and it is not useful to include it in wxRTTI classes hierarchy. Also, using wxControlWithItems as the base class for wxChoice and wxListBox but not for wxComboBox is inconsistent but wxControlWithItems can't be used for the latter so resolve this by not using it at all. Ideally we'd have a way of retrieving the list of supported interfaces (such as wxItemContainer or wxTextEntry) via wxRTTI too. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/choiccmn.cpp | 2 +- src/common/lboxcmn.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/choiccmn.cpp b/src/common/choiccmn.cpp index 5dd372a318..dc925335a2 100644 --- a/src/common/choiccmn.cpp +++ b/src/common/choiccmn.cpp @@ -65,7 +65,7 @@ wxFLAGS_MEMBER(wxHSCROLL) wxEND_FLAGS( wxChoiceStyle ) -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxChoice, wxControlWithItems, "wx/choice.h") +wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxChoice, wxControl, "wx/choice.h") wxBEGIN_PROPERTIES_TABLE(wxChoice) wxEVENT_PROPERTY( Select, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEvent ) diff --git a/src/common/lboxcmn.cpp b/src/common/lboxcmn.cpp index 7e8b2be8e4..da8bc5f35d 100644 --- a/src/common/lboxcmn.cpp +++ b/src/common/lboxcmn.cpp @@ -86,7 +86,7 @@ wxFLAGS_MEMBER(wxLB_NEEDED_SB) wxFLAGS_MEMBER(wxLB_SORT) wxEND_FLAGS( wxListBoxStyle ) -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxListBox, wxControlWithItems, "wx/listbox.h") +wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxListBox, wxControl, "wx/listbox.h") wxBEGIN_PROPERTIES_TABLE(wxListBox) wxEVENT_PROPERTY( Select, wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEvent )