Merge pull request #827 from MikeTheWatchGuy/Dev-latest

Dev latest
This commit is contained in:
MikeTheWatchGuy 2018-12-01 21:40:40 -05:00 committed by GitHub
commit 052abec94e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 10 deletions

View file

@ -3125,7 +3125,7 @@ class Window:
except:
self.TKrootDestroyed = True
_my_windows.Decrement()
print('ROOT Destroyed')
# print('ROOT Destroyed')
results = BuildResults(self, False, self)
if results[0] != None and results[0] != timeout_key:
return results
@ -3136,7 +3136,7 @@ class Window:
# print("** REALTIME PROBLEM FOUND **", results)
if self.RootNeedsDestroying:
print('*** DESTROYING really late***')
# print('*** DESTROYING really late***')
self.TKroot.destroy()
# _my_windows.Decrement()
self.LastButtonClicked = None
@ -3191,7 +3191,8 @@ class Window:
self.TKroot.quit()
self.TKroot.destroy()
except:
print('DESTROY FAILED')
pass
# print('DESTROY FAILED')
return None, None
if not self.Shown:
self.Show(non_blocking=True)
@ -3200,10 +3201,10 @@ class Window:
except:
self.TKrootDestroyed = True
_my_windows.Decrement()
print("read failed")
# print("read failed")
# return None, None
if self.RootNeedsDestroying:
print('*** DESTROYING LATE ***', self.ReturnValues)
# print('*** DESTROYING LATE ***', self.ReturnValues)
self.TKroot.destroy()
_my_windows.Decrement()
self.Values = None
@ -3864,8 +3865,7 @@ def BuildResultsForSubform(form, initialize_only, top_level_form):
value = element.ClickPosition
elif element.Type == ELEM_TYPE_MENUBAR:
if element.MenuItemChosen is not None:
top_level_form.LastButtonClicked = element.MenuItemChosen
button_pressed_text = top_level_form.LastButtonClicked
button_pressed_text = top_level_form.LastButtonClicked = element.MenuItemChosen
value = element.MenuItemChosen
element.MenuItemChosen = None
else: