Merge PR #1433 to avoid conflicts as same lines affected

2019-05-17 13:17:24 +02:00 · 2019-05-17 13:17:24 +02:00 · 4d137e19c4
commit 4d137e19c4
parent 7aa110b1fe
1 changed files with 9 additions and 0 deletions
--- a/PySimpleGUI.py
+++ b/PySimpleGUI.py
@ -1636,6 +1636,15 @@ class Button(Element):
            self.TKCal.pack(expand=1, fill='both')
            root.update()
            
+             if type(Window.user_defined_icon) is bytes:
+                calendar_icon = tkinter.PhotoImage(data=Window.user_defined_icon)
+            else:
+                calendar_icon = DEFAULT_BASE64_ICON
+            try:
+                root.tk.call('wm', 'iconphoto', root._w, calendar_icon)
+            except:
+                pass
+
        if should_submit_window:
            self.ParentForm.LastButtonClicked = target_element.Key
            self.ParentForm.FormRemainedOpen = True