Use stdwinevents instead of stdwinsupport.

diff --git a/Lib/lib-stdwin/gwin.py b/Lib/lib-stdwin/gwin.py
index 15aa4327ce5af35473a6d5fddb9b2e4c2bbad9b6..a53f69c46cb6dd7e96ac6df741c1f8b7eeb3b2c8 100644 (file)
--- a/Lib/lib-stdwin/gwin.py
+++ b/Lib/lib-stdwin/gwin.py
@@ -5,8 +5,10 @@
 # The mainloop() function here is an event dispatcher for all window types.
 
 import stdwin
-import stdwinsupport
+from stdwinevents import *
 
+# XXX Old version of stdwinevents, should go
+import stdwinsupport
 S = stdwinsupport                      # Shorthand
 
 windows = []                           # List of open windows
@@ -75,6 +77,8 @@ def treatevent(e):                    # Handle a stdwin event
                w.move(w)
        elif type = S.we_timer:
                w.timer(w)
+       elif type = WE_CLOSE:
+               w.close(w)
 
 def treatcommand(w, type):             # Handle a we_command event
        if type = S.wc_close:

diff --git a/Lib/stdwin/gwin.py b/Lib/stdwin/gwin.py
index 15aa4327ce5af35473a6d5fddb9b2e4c2bbad9b6..a53f69c46cb6dd7e96ac6df741c1f8b7eeb3b2c8 100755 (executable)
--- a/Lib/stdwin/gwin.py
+++ b/Lib/stdwin/gwin.py
@@ -5,8 +5,10 @@
 # The mainloop() function here is an event dispatcher for all window types.
 
 import stdwin
-import stdwinsupport
+from stdwinevents import *
 
+# XXX Old version of stdwinevents, should go
+import stdwinsupport
 S = stdwinsupport                      # Shorthand
 
 windows = []                           # List of open windows
@@ -75,6 +77,8 @@ def treatevent(e):                    # Handle a stdwin event
                w.move(w)
        elif type = S.we_timer:
                w.timer(w)
+       elif type = WE_CLOSE:
+               w.close(w)
 
 def treatcommand(w, type):             # Handle a we_command event
        if type = S.wc_close: