Author: alanmc
Date: 2007-06-14 13:09:53 -0400 (Thu, 14 Jun 2007)
New Revision: 79571
Added:
trunk/olive/class/agclr/System.Windows/TriggerActionCollection.cs
Modified:
trunk/olive/class/agclr/ChangeLog
trunk/olive/class/agclr/Mono/NativeMethods.cs
trunk/olive/class/agclr/System.Windows.Media.Animation/Animation.cs
trunk/olive/class/agclr/System.Windows.Media.Animation/BeginStoryBoard.cs
trunk/olive/class/agclr/System.Windows.Media.Animation/ColorAnimation.cs
trunk/olive/class/agclr/System.Windows.Media.Animation/DoubleAnimation.cs
trunk/olive/class/agclr/System.Windows.Media.Animation/PointAnimation.cs
trunk/olive/class/agclr/System.Windows/EventTrigger.cs
trunk/olive/class/agclr/agclr.dll.sources
Log:
Fixes for my last commit
Modified: trunk/olive/class/agclr/ChangeLog
===================================================================
--- trunk/olive/class/agclr/ChangeLog 2007-06-14 17:04:17 UTC (rev 79570)
+++ trunk/olive/class/agclr/ChangeLog 2007-06-14 17:09:53 UTC (rev 79571)
@@ -1,5 +1,10 @@
2007-06-14 Alan McGovern <[EMAIL PROTECTED]>
+ * Fixed typos in files from previous commit
+ * Animation.cs: Implemented
+
+2007-06-14 Alan McGovern <[EMAIL PROTECTED]>
+
* Implemented ColorAnimation,
DoubleAnimation,
PointAnimation,
Modified: trunk/olive/class/agclr/Mono/NativeMethods.cs
===================================================================
--- trunk/olive/class/agclr/Mono/NativeMethods.cs 2007-06-14 17:04:17 UTC
(rev 79570)
+++ trunk/olive/class/agclr/Mono/NativeMethods.cs 2007-06-14 17:09:53 UTC
(rev 79571)
@@ -281,6 +281,28 @@
[DllImport("moon")]
internal extern static IntPtr storyboard_new ();
+ [DllImport("moon")]
+ internal extern static IntPtr beginstoryboard_new ();
+
+ [DllImport("moon")]
+ internal extern static IntPtr animation_new ();
+
+ [DllImport("moon")]
+ internal extern static IntPtr coloranimation_new ();
+
+ [DllImport("moon")]
+ internal extern static IntPtr doubleanimation_new ();
+
+ [DllImport("moon")]
+ internal extern static IntPtr triggeractioncollection_new ();
+
+ [DllImport("moon")]
+ internal extern static IntPtr pointanimation_new ();
+
+ [DllImport("moon")]
+ internal extern static IntPtr eventtrigger_new ();
+
+
#endregion
#region Storyboard
Modified: trunk/olive/class/agclr/System.Windows/EventTrigger.cs
===================================================================
--- trunk/olive/class/agclr/System.Windows/EventTrigger.cs 2007-06-14
17:04:17 UTC (rev 79570)
+++ trunk/olive/class/agclr/System.Windows/EventTrigger.cs 2007-06-14
17:09:53 UTC (rev 79571)
@@ -27,13 +27,13 @@
//
using Mono;
namespace System.Windows
-{/*
+{
public sealed class EventTrigger : DependencyObject
{
- public static readonly DependancyProperty ActionsProperty =
+ public static readonly DependencyProperty ActionsProperty =
DependencyProperty.Lookup (Kind.EVENTTRIGGER,
"ACTIONS", typeof (TriggerActionCollection));
- public static readonly DependancyProperty RoutedEventProperty =
+ public static readonly DependencyProperty RoutedEventProperty =
DependencyProperty.Lookup (Kind.EVENTTRIGGER,
"ROUTEDEVENT", typeof (string));
@@ -61,5 +61,5 @@
{
return Kind.EVENTTRIGGER;
}
- }*/
+ }
}
Added: trunk/olive/class/agclr/System.Windows/TriggerActionCollection.cs
===================================================================
--- trunk/olive/class/agclr/System.Windows/TriggerActionCollection.cs
2007-06-14 17:04:17 UTC (rev 79570)
+++ trunk/olive/class/agclr/System.Windows/TriggerActionCollection.cs
2007-06-14 17:09:53 UTC (rev 79571)
@@ -0,0 +1,48 @@
+//
+// EventTrigger.cs
+//
+// Author:
+// Alan McGovern ([EMAIL PROTECTED])
+//
+// Copyright 2007 Novell, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTEVENTTRIGGERHER LIABILITY, WHETHER IN AN
ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+using Mono;
+namespace System.Windows
+{
+ public sealed class TriggerActionCollection :
+
MS.Internal.Collection<System.Windows.Media.Animation.BeginStoryboard>
+ {
+ public TriggerActionCollection(): base
(Mono.NativeMethods.triggeractioncollection_new ())
+ {
+ }
+
+ internal TriggerActionCollection (IntPtr raw) : base (raw)
+ {
+ }
+
+
+ protected internal override Kind GetKind()
+ {
+ return Kind.EVENTTRIGGER;
+ }
+ }
+}
Modified: trunk/olive/class/agclr/System.Windows.Media.Animation/Animation.cs
===================================================================
--- trunk/olive/class/agclr/System.Windows.Media.Animation/Animation.cs
2007-06-14 17:04:17 UTC (rev 79570)
+++ trunk/olive/class/agclr/System.Windows.Media.Animation/Animation.cs
2007-06-14 17:09:53 UTC (rev 79571)
@@ -28,13 +28,14 @@
using Mono;
using System.Windows;
namespace System.Windows.Media.Animation
-{/*
+{
public abstract class Animation : Timeline
{
public Animation(): base (Mono.NativeMethods.animation_new ())
{
}
+
internal Animation (IntPtr raw) : base (raw)
{
}
@@ -44,5 +45,5 @@
{
return Kind.ANIMATION;
}
- }*/
+ }
}
Modified:
trunk/olive/class/agclr/System.Windows.Media.Animation/BeginStoryBoard.cs
===================================================================
--- trunk/olive/class/agclr/System.Windows.Media.Animation/BeginStoryBoard.cs
2007-06-14 17:04:17 UTC (rev 79570)
+++ trunk/olive/class/agclr/System.Windows.Media.Animation/BeginStoryBoard.cs
2007-06-14 17:09:53 UTC (rev 79571)
@@ -28,25 +28,25 @@
using Mono;
using System.Windows;
namespace System.Windows.Media.Animation
-{/*
- public sealed class BeginStoryBoard : DependencyObject
+{
+ public sealed class BeginStoryboard : DependencyObject
{
public static readonly DependencyProperty StoryBoardProperty =
DependencyProperty.Lookup (Kind.BEGINSTORYBOARD,
"STORYBOARD", typeof (Storyboard));
- public BeginStoryBoard(): base
(Mono.NativeMethods.beginstoryboard_new ())
+ public BeginStoryboard(): base
(Mono.NativeMethods.beginstoryboard_new ())
{
}
- internal BeginStoryBoard (IntPtr raw) : base (raw)
+ internal BeginStoryboard (IntPtr raw) : base (raw)
{
}
- public Storyboard By {
- get { return (Storyboard) GetValue(ByProperty); }
- set { SetValue(ByProperty, value); }
+ public Storyboard Storyboard {
+ get { return (Storyboard) GetValue(StoryBoardProperty);
}
+ set { SetValue(StoryBoardProperty, value); }
}
@@ -54,5 +54,5 @@
{
return Kind.BEGINSTORYBOARD;
}
- }*/
+ }
}
Modified:
trunk/olive/class/agclr/System.Windows.Media.Animation/ColorAnimation.cs
===================================================================
--- trunk/olive/class/agclr/System.Windows.Media.Animation/ColorAnimation.cs
2007-06-14 17:04:17 UTC (rev 79570)
+++ trunk/olive/class/agclr/System.Windows.Media.Animation/ColorAnimation.cs
2007-06-14 17:09:53 UTC (rev 79571)
@@ -27,7 +27,7 @@
//
using Mono;
namespace System.Windows.Media.Animation
-{/*
+{
public class ColorAnimation : System.Windows.Media.Animation.Animation
{
public static readonly DependencyProperty ByProperty =
@@ -66,5 +66,5 @@
{
return Kind.COLORANIMATION;
}
- }*/
+ }
}
Modified:
trunk/olive/class/agclr/System.Windows.Media.Animation/DoubleAnimation.cs
===================================================================
--- trunk/olive/class/agclr/System.Windows.Media.Animation/DoubleAnimation.cs
2007-06-14 17:04:17 UTC (rev 79570)
+++ trunk/olive/class/agclr/System.Windows.Media.Animation/DoubleAnimation.cs
2007-06-14 17:09:53 UTC (rev 79571)
@@ -27,7 +27,7 @@
//
using Mono;
namespace System.Windows.Media.Animation
-{/*
+{
public class DoubleAnimation : System.Windows.Media.Animation.Animation
{
public static readonly DependencyProperty ByProperty =
@@ -48,7 +48,7 @@
public Nullable<double> By {
- get { return (double) GetValus(ByProperty); }
+ get { return (double) GetValue(ByProperty); }
set { SetValue(ByProperty, value); }
}
@@ -66,5 +66,5 @@
{
return Kind.DOUBLEANIMATION;
}
- }*/
+ }
}
Modified:
trunk/olive/class/agclr/System.Windows.Media.Animation/PointAnimation.cs
===================================================================
--- trunk/olive/class/agclr/System.Windows.Media.Animation/PointAnimation.cs
2007-06-14 17:04:17 UTC (rev 79570)
+++ trunk/olive/class/agclr/System.Windows.Media.Animation/PointAnimation.cs
2007-06-14 17:09:53 UTC (rev 79571)
@@ -27,7 +27,7 @@
//
using Mono;
namespace System.Windows.Media.Animation
-{/*
+{
public class PointAnimation : System.Windows.Media.Animation.Animation
{
public static readonly DependencyProperty ByProperty =
@@ -66,5 +66,5 @@
{
return Kind.POINTANIMATION;
}
- }*/
+ }
}
Modified: trunk/olive/class/agclr/agclr.dll.sources
===================================================================
--- trunk/olive/class/agclr/agclr.dll.sources 2007-06-14 17:04:17 UTC (rev
79570)
+++ trunk/olive/class/agclr/agclr.dll.sources 2007-06-14 17:09:53 UTC (rev
79571)
@@ -19,6 +19,7 @@
System.Windows/Rect.cs
System.Windows/Size.cs
System.Windows/TriggerCollection.cs
+System.Windows/TriggerActionCollection.cs
System.Windows/UIElement.cs
System.Windows/Visibility.cs
System.Windows/XamlReader.cs
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches