From 4d137e19c42ac85aecdd72e94cfbbe0f8d0242cb Mon Sep 17 00:00:00 2001
From: Orsiris de Jong <ozy@netpower.fr>
Date: Fri, 17 May 2019 13:17:24 +0200
Subject: [PATCH] Merge PR #1433 to avoid conflicts as same lines affected

---
 PySimpleGUI.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/PySimpleGUI.py b/PySimpleGUI.py
index 2e3e4944..a81f0bc9 100644
--- a/PySimpleGUI.py
+++ b/PySimpleGUI.py
@@ -1635,6 +1635,15 @@ class Button(Element):
             self.TKCal = TKCalendar(master=root, firstweekday=calendar.SUNDAY, target_element=target_element, close_when_chosen=self.CalendarCloseWhenChosen, default_date=self.DefaultDate_M_D_Y, locale=self.CalendarLocale, format=self.CalendarFormat)
             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