Merge pull request #1663 from PySimpleGUI/Dev-latest
New option ENABLE_TK_WINDOWS. If True, will not use hidden master win…
This commit is contained in:
commit
d16fa56df3
|
@ -223,6 +223,7 @@ WRITE_ONLY_KEY = '__WRITE ONLY__'
|
||||||
MENU_DISABLED_CHARACTER = '!'
|
MENU_DISABLED_CHARACTER = '!'
|
||||||
MENU_KEY_SEPARATOR = '::'
|
MENU_KEY_SEPARATOR = '::'
|
||||||
|
|
||||||
|
ENABLE_TK_WINDOWS = False
|
||||||
|
|
||||||
# ====================================================================== #
|
# ====================================================================== #
|
||||||
# One-liner functions that are handy as f_ck #
|
# One-liner functions that are handy as f_ck #
|
||||||
|
@ -4986,7 +4987,10 @@ class Window:
|
||||||
|
|
||||||
if self.RootNeedsDestroying:
|
if self.RootNeedsDestroying:
|
||||||
# print('*** DESTROYING really late***')
|
# print('*** DESTROYING really late***')
|
||||||
self.TKroot.destroy()
|
try:
|
||||||
|
self.TKroot.destroy()
|
||||||
|
except:
|
||||||
|
pass
|
||||||
# _my_windows.Decrement()
|
# _my_windows.Decrement()
|
||||||
self.LastButtonClicked = None
|
self.LastButtonClicked = None
|
||||||
return None, None
|
return None, None
|
||||||
|
@ -5012,7 +5016,10 @@ class Window:
|
||||||
self.TimerCancelled = True
|
self.TimerCancelled = True
|
||||||
if self.RootNeedsDestroying:
|
if self.RootNeedsDestroying:
|
||||||
# print('*** DESTROYING LATE ***')
|
# print('*** DESTROYING LATE ***')
|
||||||
self.TKroot.destroy()
|
try:
|
||||||
|
self.TKroot.destroy()
|
||||||
|
except:
|
||||||
|
pass
|
||||||
Window.DecrementOpenCount()
|
Window.DecrementOpenCount()
|
||||||
# _my_windows.Decrement()
|
# _my_windows.Decrement()
|
||||||
self.LastButtonClicked = None
|
self.LastButtonClicked = None
|
||||||
|
@ -8113,7 +8120,10 @@ def StartupTK(my_flex_form: Window):
|
||||||
# ow = _my_windows.NumOpenWindows
|
# ow = _my_windows.NumOpenWindows
|
||||||
ow = Window.NumOpenWindows
|
ow = Window.NumOpenWindows
|
||||||
# print('Starting TK open Windows = {}'.format(ow))
|
# print('Starting TK open Windows = {}'.format(ow))
|
||||||
if not ow and not my_flex_form.ForceTopLevel:
|
if ENABLE_TK_WINDOWS:
|
||||||
|
root = tk.Tk()
|
||||||
|
Window.IncrementOpenCount()
|
||||||
|
elif not ow and not my_flex_form.ForceTopLevel:
|
||||||
# if first window being created, make a throwaway, hidden master root. This stops one user
|
# if first window being created, make a throwaway, hidden master root. This stops one user
|
||||||
# window from becoming the child of another user window. All windows are children of this
|
# window from becoming the child of another user window. All windows are children of this
|
||||||
# hidden window
|
# hidden window
|
||||||
|
@ -8201,7 +8211,10 @@ def StartupTK(my_flex_form: Window):
|
||||||
Window.DecrementOpenCount()
|
Window.DecrementOpenCount()
|
||||||
# _my_windows.Decrement()
|
# _my_windows.Decrement()
|
||||||
if my_flex_form.RootNeedsDestroying:
|
if my_flex_form.RootNeedsDestroying:
|
||||||
my_flex_form.TKroot.destroy()
|
try:
|
||||||
|
my_flex_form.TKroot.destroy()
|
||||||
|
except:
|
||||||
|
pass
|
||||||
my_flex_form.RootNeedsDestroying = False
|
my_flex_form.RootNeedsDestroying = False
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue