Author: rolf
Date: 2007-06-14 09:49:41 -0400 (Thu, 14 Jun 2007)
New Revision: 79540
Modified:
trunk/olive/class/agclr/System.Windows/ChangeLog
trunk/olive/class/agclr/System.Windows/DependencyObject.cs
trunk/olive/class/agclr/System.Windows/Downloader.cs
trunk/olive/class/agclr/System.Windows/FrameworkElement.cs
trunk/olive/class/agclr/System.Windows/ResourceCollection.cs
trunk/olive/class/agclr/System.Windows/TriggerCollection.cs
trunk/olive/class/agclr/System.Windows/UIElement.cs
Log:
* TriggerCollection.cs, UIElement.cs, Downloader.cs,
ResourceCollection.cs, DependencyObject.cs, FrameworkElement.cs:
Constructor fixes, part 3.
Modified: trunk/olive/class/agclr/System.Windows/ChangeLog
===================================================================
--- trunk/olive/class/agclr/System.Windows/ChangeLog 2007-06-14 13:48:19 UTC
(rev 79539)
+++ trunk/olive/class/agclr/System.Windows/ChangeLog 2007-06-14 13:49:41 UTC
(rev 79540)
@@ -1,3 +1,9 @@
+2007-06-14 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
+
+ * TriggerCollection.cs, UIElement.cs, Downloader.cs,
+ ResourceCollection.cs, DependencyObject.cs, FrameworkElement.cs:
+ Constructor fixes, part 3.
+
2007-06-13 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
* Downloader.cs, DependencyObject.cs: Second pass on constructors.
Modified: trunk/olive/class/agclr/System.Windows/DependencyObject.cs
===================================================================
--- trunk/olive/class/agclr/System.Windows/DependencyObject.cs 2007-06-14
13:48:19 UTC (rev 79539)
+++ trunk/olive/class/agclr/System.Windows/DependencyObject.cs 2007-06-14
13:49:41 UTC (rev 79540)
@@ -46,7 +46,7 @@
return _native;
}
- set {
+ private set {
_native = value;
if (objects.Contains (value))
return;
Modified: trunk/olive/class/agclr/System.Windows/Downloader.cs
===================================================================
--- trunk/olive/class/agclr/System.Windows/Downloader.cs 2007-06-14
13:48:19 UTC (rev 79539)
+++ trunk/olive/class/agclr/System.Windows/Downloader.cs 2007-06-14
13:49:41 UTC (rev 79540)
@@ -41,6 +41,10 @@
public Downloader () : base (NativeMethods.downloader_new ())
{
}
+
+ internal Downloader (IntPtr raw) : base (raw)
+ {
+ }
public double DownloadProgress {
Modified: trunk/olive/class/agclr/System.Windows/FrameworkElement.cs
===================================================================
--- trunk/olive/class/agclr/System.Windows/FrameworkElement.cs 2007-06-14
13:48:19 UTC (rev 79539)
+++ trunk/olive/class/agclr/System.Windows/FrameworkElement.cs 2007-06-14
13:49:41 UTC (rev 79540)
@@ -37,36 +37,40 @@
HeightProperty = DependencyProperty.Lookup
(Kind.FRAMEWORKELEMENT, "Height", typeof (double));
}
+ public FrameworkElement () : base
(NativeMethods.framework_element_new ())
+ {
+ }
+
internal FrameworkElement (IntPtr raw) : base (raw)
{
}
- public double Height {
- get {
+ public double Height {
+ get {
return (double) GetValue (HeightProperty);
}
-
- set {
+
+ set {
SetValue (HeightProperty, value);
}
- }
-
- public object Parent {
- get { return parent; }
- }
-
- public double Width {
- get {
+ }
+
+ public object Parent {
+ get { return parent; }
+ }
+
+ public double Width {
+ get {
return (double) GetValue (WidthProperty);
- }
-
- set {
+ }
+
+ set {
SetValue (WidthProperty, value);
}
- }
-
- public static readonly DependencyProperty WidthProperty;
- public static readonly DependencyProperty HeightProperty;
+ }
+
+ public static readonly DependencyProperty WidthProperty;
+ public static readonly DependencyProperty HeightProperty;
protected internal override Kind GetKind ()
{
Modified: trunk/olive/class/agclr/System.Windows/ResourceCollection.cs
===================================================================
--- trunk/olive/class/agclr/System.Windows/ResourceCollection.cs
2007-06-14 13:48:19 UTC (rev 79539)
+++ trunk/olive/class/agclr/System.Windows/ResourceCollection.cs
2007-06-14 13:49:41 UTC (rev 79540)
@@ -34,11 +34,14 @@
namespace System.Windows {
public class ResourceCollection : MS.Internal.Collection<int> {
- public ResourceCollection ()
+ public ResourceCollection () : base
(NativeMethods.resource_collection_new ())
{
- native = NativeMethods.resource_collection_new ();
}
+ internal ResourceCollection (IntPtr raw) : base (raw)
+ {
+ }
+
protected internal override Kind GetKind ()
{
return Kind.RESOURCE_COLLECTION;
Modified: trunk/olive/class/agclr/System.Windows/TriggerCollection.cs
===================================================================
--- trunk/olive/class/agclr/System.Windows/TriggerCollection.cs 2007-06-14
13:48:19 UTC (rev 79539)
+++ trunk/olive/class/agclr/System.Windows/TriggerCollection.cs 2007-06-14
13:49:41 UTC (rev 79540)
@@ -34,11 +34,14 @@
namespace System.Windows {
public class TriggerCollection : MS.Internal.Collection<int> {
- public TriggerCollection ()
+ public TriggerCollection () : base
(NativeMethods.trigger_collection_new ())
{
- native = NativeMethods.trigger_collection_new ();
}
+ internal TriggerCollection (IntPtr raw) : base (raw)
+ {
+ }
+
protected internal override Kind GetKind ()
{
return Kind.TRIGGER_COLLECTION;
Modified: trunk/olive/class/agclr/System.Windows/UIElement.cs
===================================================================
--- trunk/olive/class/agclr/System.Windows/UIElement.cs 2007-06-14 13:48:19 UTC
(rev 79539)
+++ trunk/olive/class/agclr/System.Windows/UIElement.cs 2007-06-14 13:49:41 UTC
(rev 79540)
@@ -60,6 +60,10 @@
ResourcesProperty = DependencyProperty.Lookup
(Kind.UIELEMENT, "Resources", typeof (ResourceCollection));
}
+ public UIElement () : base (NativeMethods.uielement_new ())
+ {
+ }
+
internal UIElement (IntPtr raw) : base (raw)
{
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches