Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Pouliot <sebastien@ximian.com>2005-11-16 17:26:14 +0300
committerSebastien Pouliot <sebastien@ximian.com>2005-11-16 17:26:14 +0300
commit4b213fe79ecbefa9746d19bba2a7ee28362cd66d (patch)
treec7784b5e294427c2c911c317cce285b71af211a5 /mcs/class/System/System.Timers/Timer.cs
parentdddb4d84708ad909a334fbc1d39825b1fa00f85f (diff)
2005-11-16 Sebastien Pouliot <sebastien@ximian.com>
* ElapsedEventHandler.cs: Remove [Serializable] from 2.0 profile. * Timer.cs: Add [Browsable(false)] to SynchronizingObject property for 2.0 profile. * TimersDescriptionAttribute.cs: Description always returns null. svn path=/trunk/mcs/; revision=53118
Diffstat (limited to 'mcs/class/System/System.Timers/Timer.cs')
-rw-r--r--mcs/class/System/System.Timers/Timer.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/mcs/class/System/System.Timers/Timer.cs b/mcs/class/System/System.Timers/Timer.cs
index 5e9653e2faa..dc07110bd61 100644
--- a/mcs/class/System/System.Timers/Timer.cs
+++ b/mcs/class/System/System.Timers/Timer.cs
@@ -5,6 +5,7 @@
// Gonzalo Paniagua Javier (gonzalo@ximian.com)
//
// (C) 2002 Ximian, Inc (http://www.ximian.com)
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
//
// The docs talk about server timers and such...
@@ -29,7 +30,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using System.ComponentModel;
using System.Threading;
@@ -118,6 +118,9 @@ namespace System.Timers
[DefaultValue(null)]
[TimersDescriptionAttribute("The object used to marshal the event handler calls issued " +
"when an interval has elapsed.")]
+#if NET_2_0
+ [Browsable (false)]
+#endif
public ISynchronizeInvoke SynchronizingObject
{
get { return so; }