1 files changed, 44 insertions, 11 deletions

diff --git a/widgets/misc/test-dateedit.c b/widgets/misc/test-dateedit.c
index 12fb93ac88..e40b152039 100644
--- a/widgets/misc/test-dateedit.c
+++ b/widgets/misc/test-dateedit.c
@@ -45,42 +45,75 @@ main (int argc, char **argv)
 {
 	GtkWidget *app;
 	EDateEdit *dedit;
-	GtkWidget *vbox, *button;
+	GtkWidget *table, *button;
 
 	gnome_init ("test-dateedit", "0.0", argc, argv);
 
 	app = gnome_app_new ("Test", "Test");
-	gtk_window_set_default_size (GTK_WINDOW (app), 400, 200);
+	gtk_window_set_default_size (GTK_WINDOW (app), 300, 200);
 	gtk_window_set_policy (GTK_WINDOW (app), FALSE, TRUE, TRUE);
 	gtk_container_set_border_width (GTK_CONTAINER (app), 8);
 
 	gtk_signal_connect (GTK_OBJECT (app), "delete_event",
 			    GTK_SIGNAL_FUNC (delete_event_cb), NULL);
 
+	table = gtk_table_new (3, 2, FALSE);
+	gtk_table_set_row_spacings (GTK_TABLE (table), 4);
+	gtk_table_set_col_spacings (GTK_TABLE (table), 4);
+	gtk_widget_show (table);
+	gnome_app_set_contents (GNOME_APP (app), table);
+
+	/* EDateEdit 1. */
 	dedit = E_DATE_EDIT (e_date_edit_new ());
+	gtk_table_attach (GTK_TABLE (table), (GtkWidget*) dedit,
+			  0, 1, 0, 1, GTK_FILL, GTK_EXPAND, 0, 0);
 	gtk_widget_show ((GtkWidget*) (dedit));
 
+	button = gtk_button_new_with_label ("Print Date");
+	gtk_table_attach (GTK_TABLE (table), button,
+			  1, 2, 0, 1, 0, 0, 0, 0);
+	gtk_widget_show (button);
+	gtk_signal_connect (GTK_OBJECT (button), "clicked",
+			    GTK_SIGNAL_FUNC (on_get_date_clicked), dedit);
+
+	/* EDateEdit 2. */
+	dedit = E_DATE_EDIT (e_date_edit_new ());
+	gtk_table_attach (GTK_TABLE (table), (GtkWidget*) dedit,
+			  0, 1, 1, 2, GTK_FILL, GTK_EXPAND, 0, 0);
+	gtk_widget_show ((GtkWidget*) (dedit));
 	e_date_edit_set_week_start_day (dedit, 1);
 	e_date_edit_set_show_week_numbers (dedit, TRUE);
 	e_date_edit_set_use_24_hour_format (dedit, FALSE);
 	e_date_edit_set_time_popup_range (dedit, 8, 18);
-#if 0
 	e_date_edit_set_show_time (dedit, FALSE);
-#endif
 
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), (GtkWidget*) dedit,
-			    FALSE, TRUE, 0);
-	gtk_widget_show (vbox);
+	button = gtk_button_new_with_label ("Print Date");
+	gtk_table_attach (GTK_TABLE (table), button,
+			  1, 2, 1, 2, 0, 0, 0, 0);
+	gtk_widget_show (button);
+	gtk_signal_connect (GTK_OBJECT (button), "clicked",
+			    GTK_SIGNAL_FUNC (on_get_date_clicked), dedit);
 
-	button = gtk_button_new_with_label ("Get Date");
-	gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, TRUE, 0);
+	/* EDateEdit 3. */
+	dedit = E_DATE_EDIT (e_date_edit_new ());
+	gtk_table_attach (GTK_TABLE (table), (GtkWidget*) dedit,
+			  0, 1, 2, 3, GTK_FILL, GTK_EXPAND, 0, 0);
+	gtk_widget_show ((GtkWidget*) (dedit));
+	e_date_edit_set_week_start_day (dedit, 1);
+	e_date_edit_set_show_week_numbers (dedit, TRUE);
+	e_date_edit_set_use_24_hour_format (dedit, FALSE);
+	e_date_edit_set_time_popup_range (dedit, 8, 18);
+	e_date_edit_set_allow_no_date_set (dedit, TRUE);
+
+	button = gtk_button_new_with_label ("Print Date");
+	gtk_table_attach (GTK_TABLE (table), button,
+			  1, 2, 2, 3, 0, 0, 0, 0);
 	gtk_widget_show (button);
 	gtk_signal_connect (GTK_OBJECT (button), "clicked",
 			    GTK_SIGNAL_FUNC (on_get_date_clicked), dedit);
 
 
-	gnome_app_set_contents (GNOME_APP (app), vbox);
+
 	gtk_widget_show (app);
 
 	gtk_main ();