Detect attempts to catch wxEVT_TEXT_ENTER without wxTE_PROCESS_ENTER
This is never going to work, so complain about trying to do it to help with catching this bug. This is possible thanks to the new OnDynamicBind() method invoked whenever a dynamic event handler is bound to a control, so this doesn't detect all possible occurrences of the bug (such as specifying the handler in a static event table or in a validator), but it's still better than nothing. In the future OnDynamicBind() should be extended for other invalid calls, e.g. binding a handler for wxEVT_TEXT_ENTER to a non-text control shouldn't work neither, ideally.
This commit is contained in:
parent
baff0c942b
commit
5591a20093
@ -3671,6 +3671,15 @@ protected:
|
||||
virtual bool TryParent(wxEvent& event), return DoTryApp(event); )
|
||||
#endif // WXWIN_COMPATIBILITY_2_8
|
||||
|
||||
// Overriding this method allows filtering the event handlers dynamically
|
||||
// connected to this object. If this method returns false, the handler is
|
||||
// not connected at all. If it returns true, it is connected using the
|
||||
// possibly modified fields of the given entry.
|
||||
virtual bool OnDynamicBind(wxDynamicEventTableEntry& WXUNUSED(entry))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
static const wxEventTable sm_eventTable;
|
||||
virtual const wxEventTable *GetEventTable() const;
|
||||
|
@ -743,6 +743,11 @@ public:
|
||||
}
|
||||
|
||||
protected:
|
||||
// Override wxEvtHandler method to check for a common problem of binding
|
||||
// wxEVT_TEXT_ENTER to a control without wxTE_PROCESS_ENTER style, which is
|
||||
// never going to work.
|
||||
virtual bool OnDynamicBind(wxDynamicEventTableEntry& entry);
|
||||
|
||||
// override streambuf method
|
||||
#if wxHAS_TEXT_WINDOW_STREAM
|
||||
int overflow(int i) wxOVERRIDE;
|
||||
|
@ -1693,6 +1693,13 @@ void wxEvtHandler::DoBind(int id,
|
||||
wxDynamicEventTableEntry *entry =
|
||||
new wxDynamicEventTableEntry(eventType, id, lastId, func, userData);
|
||||
|
||||
// Check if the derived class allows binding such event handlers.
|
||||
if ( !OnDynamicBind(*entry) )
|
||||
{
|
||||
delete entry;
|
||||
return;
|
||||
}
|
||||
|
||||
if (!m_dynamicEvents)
|
||||
m_dynamicEvents = new DynamicEvents;
|
||||
|
||||
|
@ -1194,6 +1194,21 @@ void wxTextCtrlBase::DoUpdateWindowUI(wxUpdateUIEvent& event)
|
||||
}
|
||||
}
|
||||
|
||||
bool wxTextCtrlBase::OnDynamicBind(wxDynamicEventTableEntry& entry)
|
||||
{
|
||||
if ( entry.m_eventType == wxEVT_TEXT_ENTER )
|
||||
{
|
||||
wxCHECK_MSG
|
||||
(
|
||||
HasFlag(wxTE_PROCESS_ENTER),
|
||||
false,
|
||||
wxS("Must have wxTE_PROCESS_ENTER for wxEVT_TEXT_ENTER to work")
|
||||
);
|
||||
}
|
||||
|
||||
return wxControl::OnDynamicBind(entry);
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// hit testing
|
||||
// ----------------------------------------------------------------------------
|
||||
|
Loading…
Reference in New Issue
Block a user