mlaga97
/
PySimpleGUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2006 from PySimpleGUI/Dev-latest 

Dev latest
This commit is contained in:
PySimpleGUI 2019-09-20 13:10:09 -04:00 committed by GitHub
parent 5f34a27f7a 627fda3ae0
commit cf4cf63b2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PySimpleGUIWx/PySimpleGUIWx.py
View File

@ -1,7 +1,7 @@
#!/usr/bin/python3 #!/usr/bin/python3
from sphinx.ext.autosummary import autosummary_table from sphinx.ext.autosummary import autosummary_table
version = __version__ = "0.13.0.3 Unreleased" version = __version__ = "0.13.0.4 Unreleased"
import sys import sys
import wx import wx
@ -4504,7 +4504,7 @@ def PackFormIntoFrame(form, containing_frame, toplevel_form):
if auto_size: if auto_size:
element.WxButton.SetWindowStyleFlag(element.WxButton.GetWindowStyleFlag() | wx.BU_EXACTFIT) element.WxButton.SetWindowStyleFlag(element.WxButton.GetWindowStyleFlag() | wx.BU_EXACTFIT)
else: else:
element.WxButton.SetMinSize(convert_tkinter_size_to_Wx((width,height), PIXEL)) element.WxButton.SetMinSize(_convert_tkinter_size_to_Wx((width,height), DEFAULT_PIXEL_TO_CHARS_CUTOFF))
if element.ButtonColor != (None, None) and element.ButtonColor != DEFAULT_BUTTON_COLOR: if element.ButtonColor != (None, None) and element.ButtonColor != DEFAULT_BUTTON_COLOR:
bc = element.ButtonColor bc = element.ButtonColor
elif toplevel_form.ButtonColor != (None, None) and toplevel_form.ButtonColor != DEFAULT_BUTTON_COLOR: elif toplevel_form.ButtonColor != (None, None) and toplevel_form.ButtonColor != DEFAULT_BUTTON_COLOR: