adding the notion of cyclic group of radiobutton

[wxWidgets.git] / include / wx / event.h

diff --git a/include/wx/event.h b/include/wx/event.h
index 1a8593121204321e706c8a760f9f366e20154aee..93e2619606e2279c258c653e06e3303744938221 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -613,6 +613,7 @@ public:
             *ypos = m_y;
     }
 
+#ifndef __WIN16__
     void GetPosition(long *xpos, long *ypos) const
     {
         if (xpos)
@@ -620,6 +621,7 @@ public:
         if (ypos)
             *ypos = (long)m_y;
     }
+#endif
 
     // Find the position of the event
     wxPoint GetPosition() const { return wxPoint(m_x, m_y); }
@@ -694,11 +696,13 @@ public:
         if (ypos) *ypos = m_y;
     }
 
+#ifndef __WIN16__
     void GetPosition(long *xpos, long *ypos) const
     {
         if (xpos) *xpos = (long)m_x; 
         if (ypos) *ypos = (long)m_y;
     }
+#endif
 
     wxPoint GetPosition() const
         { return wxPoint(m_x, m_y); }
@@ -1376,6 +1380,16 @@ public:
                   wxObject *userData = (wxObject *) NULL )
         { Connect(id, -1, eventType, func, userData); }
 
+    bool Disconnect( int id, int lastId = -1, wxEventType eventType = wxEVT_NULL,
+                  wxObjectEventFunction func = NULL,
+                  wxObject *userData = (wxObject *) NULL );
+
+    // Convenience function: take just one id
+    bool Disconnect( int id, wxEventType eventType = wxEVT_NULL,
+                  wxObjectEventFunction func = NULL,
+                  wxObject *userData = (wxObject *) NULL )
+        { return Disconnect(id, -1, eventType, func, userData); }
+       
     // implementation from now on
     virtual bool SearchEventTable(wxEventTable& table, wxEvent& event);
     bool SearchDynamicEventTable( wxEvent& event );