--- a/dwt/widgets/DateTime.d	Tue Oct 21 15:20:04 2008 +0200
+++ b/dwt/widgets/DateTime.d	Mon Dec 01 17:07:00 2008 +0100
@@ -1,5 +1,5 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+/*******************************************************************************
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -46,6 +46,10 @@
  * </p><p>
  * IMPORTANT: This class is <em>not</em> intended to be subclassed.
  * </p>
+ * 
+ * @see <a href="http://www.eclipse.org/swt/snippets/#datetime">DateTime snippets</a>
+ * @see <a href="http://www.eclipse.org/swt/examples.php">DWT Example: ControlExample</a>
+ * @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
  *
  * @since 3.3
  */
@@ -176,9 +180,12 @@
     widget.setDateValue(date);
     widget.setTarget(widget);
     widget.setAction(OS.sel_sendSelection);
-    widget.setTag(jniRef);
-    view = widget;  
-    parent.contentView().addSubview_(widget);
+    view = widget;
+}
+
+NSCalendarDate getCalendarDate () {
+    NSDate date = ((NSDatePicker)view).dateValue();
+    return date.dateWithCalendarFormat(null, null);
 }
 
 /**
@@ -196,9 +203,7 @@
  */
 public int getDay () {
     checkWidget ();
-    NSDate date = (cast(NSDatePicker)view).dateValue();
-    NSCalendarDate calendarDate = date.dateWithCalendarFormat(null, null);
-    return calendarDate.dayOfMonth();
+    return cast(int)/*64*/getCalendarDate().dayOfMonth();
 }
 
 /**
@@ -216,7 +221,7 @@
  */
 public int getHours () {
     checkWidget ();
-    return new NSCalendarDate((cast(NSDatePicker)view).dateValue().id).hourOfDay();
+    return cast(int)/*64*/getCalendarDate().hourOfDay();
 }
 
 /**
@@ -234,7 +239,7 @@
  */
 public int getMinutes () {
     checkWidget ();
-    return new NSCalendarDate((cast(NSDatePicker)view).dateValue().id).minuteOfHour();
+    return csat(int)/*64*/getCalendarDate().minuteOfHour();
 }
 
 /**
@@ -252,7 +257,7 @@
  */
 public int getMonth () {
     checkWidget ();
-    return new NSCalendarDate((cast(NSDatePicker)view).dateValue().id).monthOfYear() - 1;
+    return csat(int)/*64*/getCalendarDate().monthOfYear() - 1;
 }
 
 String getNameText() {
@@ -275,7 +280,7 @@
  */
 public int getSeconds () {
     checkWidget ();
-    return new NSCalendarDate((cast(NSDatePicker)view).dateValue().id).secondOfMinute();
+    return cast(int)/*64*/getCalendarDate().secondOfMinute();
 }
 
 /**
@@ -293,7 +298,7 @@
  */
 public int getYear () {
     checkWidget ();
-    return new NSCalendarDate((cast(NSDatePicker)view).dateValue().id).yearOfCommonEra();
+    return cast(int)/*64*/getCalendarDate().yearOfCommonEra();
 }
 
 /**
@@ -355,7 +360,7 @@
  */
 public void setDate (int year, int month, int day) {
     checkWidget ();
-    NSCalendarDate date = new NSCalendarDate((cast(NSDatePicker)view).dateValue().id);
+    NSCalendarDate date = getCalendarDate();
     NSCalendarDate newDate = NSCalendarDate.dateWithYear(year, month + 1, day,
             date.hourOfDay(), date.minuteOfHour(), date.secondOfMinute(), date.timeZone());
     if (newDate.yearOfCommonEra() is year && newDate.monthOfYear() is month + 1 && newDate.dayOfMonth() is day) {
@@ -378,7 +383,7 @@
  */
 public void setDay (int day) {
     checkWidget ();
-    NSCalendarDate date = new NSCalendarDate((cast(NSDatePicker)view).dateValue().id);
+    NSCalendarDate date = getCalendarDate();
     NSCalendarDate newDate = NSCalendarDate.dateWithYear(date.yearOfCommonEra(), date.monthOfYear(), day,
             date.hourOfDay(), date.minuteOfHour(), date.secondOfMinute(), date.timeZone());
     if (newDate.yearOfCommonEra() is date.yearOfCommonEra() && newDate.monthOfYear() is date.monthOfYear() && newDate.dayOfMonth() is day) {
@@ -412,7 +417,7 @@
 public void setHours (int hours) {
     checkWidget ();
     if (hours < 0 || hours > 23) return;
-    NSCalendarDate date = new NSCalendarDate((cast(NSDatePicker)view).dateValue().id);
+    NSCalendarDate date = getCalendarDate();
     NSCalendarDate newDate = NSCalendarDate.dateWithYear(date.yearOfCommonEra(), date.monthOfYear(), date.dayOfMonth(),
             hours, date.minuteOfHour(), date.secondOfMinute(), date.timeZone());
     (cast(NSDatePicker)view).setDateValue(newDate);
@@ -434,7 +439,7 @@
 public void setMinutes (int minutes) {
     checkWidget ();
     if (minutes < 0 || minutes > 59) return;
-    NSCalendarDate date = new NSCalendarDate((cast(NSDatePicker)view).dateValue().id);
+    NSCalendarDate date = getCalendarDate();
     NSCalendarDate newDate = NSCalendarDate.dateWithYear(date.yearOfCommonEra(), date.monthOfYear(), date.dayOfMonth(),
             date.hourOfDay(), minutes, date.secondOfMinute(), date.timeZone());
     (cast(NSDatePicker)view).setDateValue(newDate);
@@ -455,7 +460,7 @@
  */
 public void setMonth (int month) {
     checkWidget ();
-    NSCalendarDate date = new NSCalendarDate((cast(NSDatePicker)view).dateValue().id);
+    NSCalendarDate date = getCalendarDate();
     NSCalendarDate newDate = NSCalendarDate.dateWithYear(date.yearOfCommonEra(), month + 1, date.dayOfMonth(),
             date.hourOfDay(), date.minuteOfHour(), date.secondOfMinute(), date.timeZone());
     if (newDate.yearOfCommonEra() is date.yearOfCommonEra() && newDate.monthOfYear() is month + 1 && newDate.dayOfMonth() is date.dayOfMonth()) {
@@ -479,7 +484,7 @@
 public void setSeconds (int seconds) {
     checkWidget ();
     if (seconds < 0 || seconds > 59) return;
-    NSCalendarDate date = new NSCalendarDate((cast(NSDatePicker)view).dateValue().id);
+    NSCalendarDate date = getCalendarDate();
     NSCalendarDate newDate = NSCalendarDate.dateWithYear(date.yearOfCommonEra(), date.monthOfYear(), date.dayOfMonth(),
             date.hourOfDay(), date.minuteOfHour(), seconds, date.timeZone());
     (cast(NSDatePicker)view).setDateValue(newDate);
@@ -502,7 +507,7 @@
 public void setTime (int hours, int minutes, int seconds) {
     checkWidget ();
     if (hours < 0 || hours > 23 || minutes < 0 || minutes > 59 || seconds < 0 || seconds > 59) return;
-    NSCalendarDate date = new NSCalendarDate((cast(NSDatePicker)view).dateValue().id);
+    NSCalendarDate date = getCalendarDate();
     NSCalendarDate newDate = NSCalendarDate.dateWithYear(date.yearOfCommonEra(), date.monthOfYear(), date.dayOfMonth(),
             hours, minutes, seconds, date.timeZone());
     (cast(NSDatePicker)view).setDateValue(newDate);
@@ -523,7 +528,7 @@
  */
 public void setYear (int year) {
     checkWidget ();
-    NSCalendarDate date = new NSCalendarDate((cast(NSDatePicker)view).dateValue().id);
+    NSCalendarDate date = getCalendarDate();
     NSCalendarDate newDate = NSCalendarDate.dateWithYear(year, date.monthOfYear(), date.dayOfMonth(),
             date.hourOfDay(), date.minuteOfHour(), date.secondOfMinute(), date.timeZone());
     if (newDate.yearOfCommonEra() is year && newDate.monthOfYear() is date.monthOfYear() && newDate.dayOfMonth() is date.dayOfMonth()) {