# HG changeset patch # User Karn Kallio # Date 1316906727 16200 # Node ID 7c734edc63018031b8f2ef563d01f1428cd1e1fd # Parent 4362b15220e49509bf38a2a5d7125bec6982a080# Parent 30f9a763f5fb4fdd534057104c9c484515b5dbb6 Merge from Adam. diff -r 4362b15220e4 -r 7c734edc6301 calendar.ur --- a/calendar.ur Mon Aug 22 05:06:15 2011 -0430 +++ b/calendar.ur Sat Sep 24 18:55:27 2011 -0430 @@ -207,7 +207,7 @@ SourceL.onChange ctl.Day f val gui_t = Gui.mkGui - (fn ctl => + (fn [body ~ []] ctl => ) diff -r 4362b15220e4 -r 7c734edc6301 calendar.urs --- a/calendar.urs Mon Aug 22 05:06:15 2011 -0430 +++ b/calendar.urs Sat Sep 24 18:55:27 2011 -0430 @@ -20,7 +20,7 @@ val value : t -> signal date (* Read the date of the calendar. *) -val gui_t : Gui.gui t +val gui_t : Gui.gui t [] (* Witness that this is a gui widget. *) val create : time -> transaction t diff -r 4362b15220e4 -r 7c734edc6301 datebox.ur --- a/datebox.ur Mon Aug 22 05:06:15 2011 -0430 +++ b/datebox.ur Sat Sep 24 18:55:27 2011 -0430 @@ -1,5 +1,5 @@ type t = {Cal : Calendar.t, - Panel : TogglePanel.togglePanel Calendar.t} + Panel : TogglePanel.togglePanel Calendar.t []} type date = Calendar.date val date_eq = Calendar.date_eq @@ -7,14 +7,15 @@ val time = Calendar.time val date = Calendar.date -val format = TogglePanel.defaultFormat - --#OpenCtl -- #CloseCtl - ++ {OpenCtl = fn behaviour =>