Added convenience form of wxEvtHandler::Connect, only one id; changed
type to wxEventType; fixed my regconf.h mistake in config.cpp (oops) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
223c85b142
commit
d4a23feeb2
@ -1075,11 +1075,16 @@ class WXDLLEXPORT wxEvtHandler: public wxObject
|
||||
|
||||
virtual bool ProcessEvent(wxEvent& event);
|
||||
virtual bool SearchEventTable(wxEventTable& table, wxEvent& event);
|
||||
|
||||
void Connect( int id, int lastId,
|
||||
int eventType,
|
||||
|
||||
// Dynamic association of a member function handler with the event handler, id and event type
|
||||
void Connect( int id, int lastId, wxEventType eventType,
|
||||
wxObjectEventFunction func,
|
||||
wxObject *userData = (wxObject *) NULL );
|
||||
|
||||
// Convenience function: take just one id
|
||||
inline void Connect( int id, wxEventType eventType,
|
||||
wxObjectEventFunction func,
|
||||
wxObject *userData = (wxObject *) NULL ) { Connect(id, -1, eventType, func, userData); }
|
||||
|
||||
bool SearchDynamicEventTable( wxEvent& event );
|
||||
|
||||
|
@ -42,7 +42,7 @@
|
||||
// we must include (one of) these files for wxConfigBase::Create
|
||||
#if defined(__WXMSW__) && defined(wxCONFIG_WIN32_NATIVE)
|
||||
#ifdef __WIN32__
|
||||
#include <wx/msw/iniconf.h>
|
||||
#include <wx/msw/regconf.h>
|
||||
#else //WIN16
|
||||
#include <wx/msw/iniconf.h>
|
||||
#endif
|
||||
|
@ -398,7 +398,7 @@ bool wxEvtHandler::SearchEventTable(wxEventTable& table, wxEvent& event)
|
||||
}
|
||||
|
||||
void wxEvtHandler::Connect( int id, int lastId,
|
||||
int eventType,
|
||||
wxEventType eventType,
|
||||
wxObjectEventFunction func,
|
||||
wxObject *userData )
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user