Patches from Will Sadkin:

[wxWidgets.git] / wxPython / wx / lib / newevent.py

diff --git a/wxPython/wx/lib/newevent.py b/wxPython/wx/lib/newevent.py
index a6c828d919dc443cc1166d604ea124677da08be8..847abc8219c1669f2157e8f715e8444e7656d5a9 100644 (file)
--- a/wxPython/wx/lib/newevent.py
+++ b/wxPython/wx/lib/newevent.py
@@ -1,5 +1,4 @@
-#!/usr/bin/env python
-"""Easy generation of new events classes and binder functions"""
+"""Easy generation of new events classes and binder objects"""
 
 __author__ = "Miki Tebeka <tebeka@cs.bgu.ac.il>"
 
@@ -19,10 +18,7 @@ def NewEvent():
             self.SetEventType(evttype)
             self.__dict__.update(kw)
 
-    def Binder(win, func):
-        win.Connect(-1, -1, evttype, func)
-
-    return _Event, Binder
+    return _Event, wx.PyEventBinder(evttype)
 
 
 
@@ -37,10 +33,7 @@ def NewCommandEvent():
             wx.PyCommandEvent.__init__(self, evttype, id)
             self.__dict__.update(kw)
     
-    def Binder(win, id, func):
-        win.Connect(id, -1, evttype, func)
-
-    return _Event, Binder
+    return _Event, wx.PyEventBinder(evttype, 1)
 
 
 #---------------------------------------------------------------------------