Compare commits

...
Author SHA1 Message Date
Chris Toshok 3482a0b686 comment out the calls to MakeTransparent for now - they cause OutOfMemoryExceptions on win32
svn path=/branches/mono-1-2-2/mcs/; revision=68953
2006-12-04 15:47:31 +00:00
Miguel de Icaza dcca9f5e7a Put in 1-2-2
svn path=/branches/mono-1-2-2/mcs/; revision=68919
2006-12-04 01:03:02 +00:00
Wade Berrier b441ad10f5 configure.in: version bump -> 1.2.2
svn path=/branches/mono-1-2-2/mono/; revision=68806
2006-12-01 06:07:03 +00:00
4 changed files with 15 additions and 5 deletions

No files matched your search

+1 -1
View File
@@ -6,7 +6,7 @@ AC_CANONICAL_SYSTEM
m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(mono,1.2)
AM_INIT_AUTOMAKE(mono,1.2.2)
AM_MAINTAINER_MODE
AC_PROG_LN_S
@@ -309,10 +309,11 @@ namespace System.Windows.Forms
dataSourceStack = new Stack ();
// back these out until we figure out what's going on with ResourceImageLoader and the call to MakeTransparent
back_button_image = ResourceImageLoader.Get ("go-previous.png");
back_button_image.MakeTransparent (Color.Transparent);
//back_button_image.MakeTransparent (Color.Transparent);
parent_rows_button_image = ResourceImageLoader.Get ("go-top.png");
parent_rows_button_image.MakeTransparent (Color.Transparent);
//parent_rows_button_image.MakeTransparent (Color.Transparent);
}
#endregion // Public Constructor
+5
View File
@@ -1,3 +1,8 @@
2006-12-03 Miguel de Icaza <[email protected]>
* DateTime.cs: Fix this on the 2.0 profile, return the
DateTimeKind for the Now property
2006-11-29 Martin Baulig <[email protected]>
* INullableValue.cs: Removed.
+6 -2
View File
@@ -432,7 +432,7 @@ namespace System
{
long now = GetNow ();
DateTime dt = new DateTime (now);
if ((now - last_now) > TimeSpan.TicksPerMinute){
to_local_time_span_object = TimeZone.CurrentTimeZone.GetLocalTimeDiff (dt);
last_now = now;
@@ -440,7 +440,11 @@ namespace System
}
// This is boxed, so we avoid locking.
return dt + (TimeSpan) to_local_time_span_object;
DateTime ret = dt + (TimeSpan) to_local_time_span_object;
#if NET_2_0
ret.kind = DateTimeKind.Local;
#endif
return ret;
}
}