Replace wxControlContainer-related macros with wxNavigationEnabled<>.
Simply inherit classes which need to provide TAB navigation among their children from wxNavigationEnabled<> and remove the now unnecessary WX_DECLARE_CONTROL_CONTAINER() macros. Also remove WX_INIT_CONTROL_CONTAINER(), WX_DELEGATE_TO_CONTROL_CONTAINER() and WX_EVENT_TABLE_CONTROL_CONTAINER() which are not needed neither any more. And remove the event tables which became empty after removing the last macro. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -32,12 +32,12 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxButtonNameStr[];
|
||||
|
||||
#define wxPB_USE_TEXTCTRL 0x0002
|
||||
|
||||
class WXDLLIMPEXP_CORE wxPickerBase : public wxControl
|
||||
class WXDLLIMPEXP_CORE wxPickerBase : public wxNavigationEnabled<wxControl>
|
||||
{
|
||||
public:
|
||||
// ctor: text is the associated text control
|
||||
wxPickerBase() : m_text(NULL), m_picker(NULL), m_sizer(NULL)
|
||||
{ WX_INIT_CONTROL_CONTAINER(); }
|
||||
{ }
|
||||
virtual ~wxPickerBase() {}
|
||||
|
||||
|
||||
@@ -179,9 +179,6 @@ protected:
|
||||
private:
|
||||
DECLARE_ABSTRACT_CLASS(wxPickerBase)
|
||||
DECLARE_EVENT_TABLE()
|
||||
|
||||
// This class must be something just like a panel...
|
||||
WX_DECLARE_CONTROL_CONTAINER();
|
||||
};
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user