(blind) fix for ambiguity between Disconnect() overloads

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/evthand.tex b/docs/latex/wx/evthand.tex
index 2efdccbe7d9bb7d8f98ed720dd7e46d83e2c59d6..e7ad8ef8f211d90f333cd61e6ff45e48f49be477 100644 (file)
--- a/docs/latex/wx/evthand.tex
+++ b/docs/latex/wx/evthand.tex
@@ -121,11 +121,11 @@ handler is disconnected.}
 
 \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{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{wxObject*}{ userData = NULL}, \param{wxEvtHandler*}{ eventSink = NULL}}
 

diff --git a/include/wx/event.h b/include/wx/event.h
index 7e2d8dae3c166f74eac3e4e5109e5a38e1e40f6a..d2515fc74dc1fe0bd1c1a32197b23dbffe2b0fcd 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -2333,19 +2333,13 @@ public:
                     wxObject *userData = (wxObject *) NULL,
                     wxEvtHandler *eventSink = (wxEvtHandler *) NULL);
 
-    bool Disconnect(int winid,
+    bool Disconnect(int winid = wxID_ANY,
                     wxEventType eventType = wxEVT_NULL,
                     wxObjectEventFunction func = NULL,
                     wxObject *userData = (wxObject *) NULL,
                     wxEvtHandler *eventSink = (wxEvtHandler *) NULL)
         { 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 ; }