Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

(blind) fix for ambiguity between Disconnect() overloads

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-02-15 12:04:53 +00:00
parent b62613041d
commit e554d626b7
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/latex/wx/evthand.tex
View File

@@ -121,11 +121,11 @@ handler is disconnected.}
\membersection{wxEvtHandler::Disconnect}\label{wxevthandlerdisconnect} \membersection{wxEvtHandler::Disconnect}\label{wxevthandlerdisconnect}
\func{bool}{Disconnect}{\param{int}{ id}, \func{bool}{Disconnect}{\param{int}{ id = \texttt{wxID\_ANY}},
\param{wxEventType }{eventType = wxEVT\_NULL}, \param{wxObjectEventFunction}{ function = NULL}, \param{wxEventType }{eventType = wxEVT\_NULL}, \param{wxObjectEventFunction}{ function = NULL},
\param{wxObject*}{ userData = NULL}, \param{wxEvtHandler*}{ eventSink = NULL}} \param{wxObject*}{ userData = NULL}, \param{wxEvtHandler*}{ eventSink = NULL}}
\func{bool}{Disconnect}{\param{int}{ id}, \param{int}{ lastId = -1}, \func{bool}{Disconnect}{\param{int}{ id}, \param{int}{ lastId = \texttt{wxID\_ANY}},
\param{wxEventType }{eventType = wxEVT\_NULL}, \param{wxObjectEventFunction}{ function = NULL}, \param{wxEventType }{eventType = wxEVT\_NULL}, \param{wxObjectEventFunction}{ function = NULL},
\param{wxObject*}{ userData = NULL}, \param{wxEvtHandler*}{ eventSink = NULL}} \param{wxObject*}{ userData = NULL}, \param{wxEvtHandler*}{ eventSink = NULL}}

8
include/wx/event.h
View File

@@ -2333,19 +2333,13 @@ public:
wxObject *userData = (wxObject *) NULL, wxObject *userData = (wxObject *) NULL,
wxEvtHandler *eventSink = (wxEvtHandler *) NULL); wxEvtHandler *eventSink = (wxEvtHandler *) NULL);
bool Disconnect(int winid, bool Disconnect(int winid = wxID_ANY,
wxEventType eventType = wxEVT_NULL, wxEventType eventType = wxEVT_NULL,
wxObjectEventFunction func = NULL, wxObjectEventFunction func = NULL,
wxObject *userData = (wxObject *) NULL, wxObject *userData = (wxObject *) NULL,
wxEvtHandler *eventSink = (wxEvtHandler *) NULL) wxEvtHandler *eventSink = (wxEvtHandler *) NULL)
{ return Disconnect(winid, wxID_ANY, eventType, func, userData, eventSink); } { return Disconnect(winid, wxID_ANY, eventType, func, userData, eventSink); }
bool Disconnect(wxEventType eventType = wxEVT_NULL,
wxObjectEventFunction func = NULL,
wxObject *userData = (wxObject *) NULL,
wxEvtHandler *eventSink = (wxEvtHandler *) NULL )
{ return Disconnect(wxID_ANY, wxID_ANY, eventType, func, userData, eventSink); }
wxList* GetDynamicEventTable() const { return m_dynamicEvents ; } wxList* GetDynamicEventTable() const { return m_dynamicEvents ; }