From 8599231d92f3ae8af0d492348354c3bb90d85dcb Mon Sep 17 00:00:00 2001 From: toshok Date: Wed, 2 Dec 2009 18:18:16 +0000 Subject: [PATCH] some 3.0 corcompare cleanup git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/moon@147476 e3ebcda4-bce8-0310-ba0a-eca2169e7518 --- .../System.Windows/System.Windows.Media/Matrix3DProjection.cs | 2 +- class/System.Windows/System.Windows.Media/PlaneProjection.cs | 2 +- class/System.Windows/System.Windows.Media/TextHintingMode.cs | 2 +- class/System.Windows/System.Windows.Media/TextOptions.cs | 11 +++++++++++ class/System.Windows/System.Windows/DependencyObject.g.cs | 3 ++- class/System.Windows/System.Windows/DependencyProperty.g.cs | 2 +- src/projection.h | 3 ++- src/type-generated.cpp | 4 ++-- src/uielement.h | 2 +- 9 files changed, 22 insertions(+), 9 deletions(-) diff --git a/class/System.Windows/System.Windows.Media/Matrix3DProjection.cs b/class/System.Windows/System.Windows.Media/Matrix3DProjection.cs index c11c7772e..003b648e1 100644 --- a/class/System.Windows/System.Windows.Media/Matrix3DProjection.cs +++ b/class/System.Windows/System.Windows.Media/Matrix3DProjection.cs @@ -26,7 +26,7 @@ // using Mono; namespace System.Windows.Media { - public partial class Matrix3DProjection : Projection { + public sealed partial class Matrix3DProjection : Projection { } } diff --git a/class/System.Windows/System.Windows.Media/PlaneProjection.cs b/class/System.Windows/System.Windows.Media/PlaneProjection.cs index 4f8d99bcf..b353702c4 100644 --- a/class/System.Windows/System.Windows.Media/PlaneProjection.cs +++ b/class/System.Windows/System.Windows.Media/PlaneProjection.cs @@ -26,7 +26,7 @@ // using Mono; namespace System.Windows.Media { - public partial class PlaneProjection : Projection { + public sealed partial class PlaneProjection : Projection { } } diff --git a/class/System.Windows/System.Windows.Media/TextHintingMode.cs b/class/System.Windows/System.Windows.Media/TextHintingMode.cs index 4253e9be7..167fef714 100644 --- a/class/System.Windows/System.Windows.Media/TextHintingMode.cs +++ b/class/System.Windows/System.Windows.Media/TextHintingMode.cs @@ -27,6 +27,6 @@ namespace System.Windows.Media { public enum TextHintingMode { Fixed, - Animating + Animated } } \ No newline at end of file diff --git a/class/System.Windows/System.Windows.Media/TextOptions.cs b/class/System.Windows/System.Windows.Media/TextOptions.cs index b8372c34c..9b4561508 100644 --- a/class/System.Windows/System.Windows.Media/TextOptions.cs +++ b/class/System.Windows/System.Windows.Media/TextOptions.cs @@ -26,5 +26,16 @@ namespace System.Windows.Media { public static partial class TextOptions { + + public static TextHintingMode GetTextHintingMode (FrameworkElement element) + { + return (TextHintingMode) element.GetValue (TextOptions.TextHintingModeProperty); + } + + public static void SetTextHintingMode (FrameworkElement element, TextHintingMode textHintingMode) + { + element.SetValue (TextOptions.TextHintingModeProperty, textHintingMode); + } + } } \ No newline at end of file diff --git a/class/System.Windows/System.Windows/DependencyObject.g.cs b/class/System.Windows/System.Windows/DependencyObject.g.cs index 7fcc53ca0..b2154a654 100644 --- a/class/System.Windows/System.Windows/DependencyObject.g.cs +++ b/class/System.Windows/System.Windows/DependencyObject.g.cs @@ -498,6 +498,7 @@ namespace System.Windows.Media { internal LineSegment (IntPtr raw, bool dropref) : base (raw, dropref) {} } + [ContentProperty ("ProjectionMatrix")] partial class Matrix3DProjection { public Matrix3DProjection () : base (NativeMethods.matrix3_dprojection_new (), true) {} internal Matrix3DProjection (IntPtr raw, bool dropref) : base (raw, dropref) {} @@ -582,7 +583,7 @@ namespace System.Windows.Media { } partial class Projection { - public Projection () : base (NativeMethods.projection_new (), true) {} + protected Projection () : base (NativeMethods.projection_new (), true) {} internal Projection (IntPtr raw, bool dropref) : base (raw, dropref) {} } diff --git a/class/System.Windows/System.Windows/DependencyProperty.g.cs b/class/System.Windows/System.Windows/DependencyProperty.g.cs index 6324f2d08..34d10127a 100644 --- a/class/System.Windows/System.Windows/DependencyProperty.g.cs +++ b/class/System.Windows/System.Windows/DependencyProperty.g.cs @@ -182,7 +182,7 @@ namespace System.Windows { public ResourceDictionary Resources { get { return (ResourceDictionary) GetValue (ResourcesProperty); } - internal set { SetValue (ResourcesProperty, value); } + set { SetValue (ResourcesProperty, value); } } public Style Style { diff --git a/src/projection.h b/src/projection.h index f9da02e36..62da9c775 100644 --- a/src/projection.h +++ b/src/projection.h @@ -135,7 +135,7 @@ class UnmanagedMatrix3D : public Matrix3D { /* @Namespace=System.Windows.Media */ class Projection : public DependencyObject { public: - /* @GenerateCBinding,GeneratePInvoke */ + /* @GenerateCBinding,GeneratePInvoke,ManagedAccess=Protected */ Projection () { SetObjectType (Type::PROJECTION); } protected: @@ -226,6 +226,7 @@ protected: }; /* @Namespace=System.Windows.Media */ +/* @ContentProperty="ProjectionMatrix" */ class Matrix3DProjection : public Projection { public: /* @GenerateCBinding,GeneratePInvoke */ diff --git a/src/type-generated.cpp b/src/type-generated.cpp index 435c9c392..564eb0052 100644 --- a/src/type-generated.cpp +++ b/src/type-generated.cpp @@ -403,7 +403,7 @@ Types::RegisterNativeTypes () types [(int) Type::MARKERSTREAM] = new Type (deployment, Type::MARKERSTREAM, Type::IMEDIASTREAM, false, false, "MarkerStream", 0, 2, NULL, 0, NULL, false, NULL, NULL); types [(int) Type::MATRIX] = new Type (deployment, Type::MATRIX, Type::DEPENDENCY_OBJECT, false, false, "Matrix", 0, 1, NULL, 0, NULL, true, (create_inst_func *) matrix_new, NULL); types [(int) Type::MATRIX3D] = new Type (deployment, Type::MATRIX3D, Type::DEPENDENCY_OBJECT, false, false, "Matrix3D", 0, 1, NULL, 0, NULL, true, (create_inst_func *) matrix3_d_new, NULL); - types [(int) Type::MATRIX3DPROJECTION] = new Type (deployment, Type::MATRIX3DPROJECTION, Type::PROJECTION, false, false, "Matrix3DProjection", 0, 1, NULL, 0, NULL, true, (create_inst_func *) matrix3_dprojection_new, NULL); + types [(int) Type::MATRIX3DPROJECTION] = new Type (deployment, Type::MATRIX3DPROJECTION, Type::PROJECTION, false, false, "Matrix3DProjection", 0, 1, NULL, 0, NULL, true, (create_inst_func *) matrix3_dprojection_new, "ProjectionMatrix"); types [(int) Type::MATRIXTRANSFORM] = new Type (deployment, Type::MATRIXTRANSFORM, Type::TRANSFORM, false, false, "MatrixTransform", 0, 1, NULL, 0, NULL, true, (create_inst_func *) matrix_transform_new, NULL); types [(int) Type::MEDIA] = new Type (deployment, Type::MEDIA, Type::IMEDIAOBJECT, false, false, "Media", 8, 9, MEDIA_Events, 0, NULL, false, NULL, NULL); types [(int) Type::MEDIAATTRIBUTE] = new Type (deployment, Type::MEDIAATTRIBUTE, Type::DEPENDENCY_OBJECT, false, false, "MediaAttribute", 0, 1, NULL, 0, NULL, true, (create_inst_func *) media_attribute_new, NULL); @@ -473,7 +473,7 @@ Types::RegisterNativeTypes () types [(int) Type::POWEREASE] = new Type (deployment, Type::POWEREASE, Type::EASINGFUNCTIONBASE, false, false, "PowerEase", 0, 1, NULL, 0, NULL, true, (create_inst_func *) power_ease_new, NULL); types [(int) Type::PROGRESSEVENTARGS] = new Type (deployment, Type::PROGRESSEVENTARGS, Type::EVENTARGS, false, false, "ProgressEventArgs", 0, 1, NULL, 0, NULL, false, NULL, NULL); types [(int) Type::PROGRESSIVESOURCE] = new Type (deployment, Type::PROGRESSIVESOURCE, Type::FILESOURCE, false, false, "ProgressiveSource", 0, 1, NULL, 0, NULL, false, NULL, NULL); - types [(int) Type::PROJECTION] = new Type (deployment, Type::PROJECTION, Type::DEPENDENCY_OBJECT, false, false, "Projection", 0, 1, NULL, 0, NULL, true, (create_inst_func *) projection_new, NULL); + types [(int) Type::PROJECTION] = new Type (deployment, Type::PROJECTION, Type::DEPENDENCY_OBJECT, false, false, "Projection", 0, 1, NULL, 0, NULL, false, (create_inst_func *) projection_new, NULL); types [(int) Type::PROPERTYCHANGEDEVENTARGS] = new Type (deployment, Type::PROPERTYCHANGEDEVENTARGS, Type::EVENTARGS, false, false, "PropertyChangedEventArgs", 0, 1, NULL, 0, NULL, false, NULL, NULL); types [(int) Type::PROPERTYPATH] = new Type (deployment, Type::PROPERTYPATH, Type::OBJECT, true, false, "PropertyPath", 0, 0, NULL, 0, NULL, true, NULL, NULL); types [(int) Type::PULSESOURCE] = new Type (deployment, Type::PULSESOURCE, Type::AUDIOSOURCE, false, false, "PulseSource", 0, 1, NULL, 0, NULL, false, NULL, NULL); diff --git a/src/uielement.h b/src/uielement.h index 0c00ecd97..26a0fa088 100644 --- a/src/uielement.h +++ b/src/uielement.h @@ -464,7 +464,7 @@ public: // in 2.0 these properties are actually in FrameworkElement /* @PropertyType=MouseCursor,DefaultValue=MouseCursorDefault,ManagedDeclaringType=FrameworkElement,ManagedPropertyType=Cursor,ManagedFieldAccess=Internal,GenerateAccessors,Validator=CursorValidator */ const static int CursorProperty; - /* @PropertyType=ResourceDictionary,ManagedDeclaringType=FrameworkElement,AutoCreateValue,ManagedFieldAccess=Internal,ManagedSetterAccess=Internal,GenerateAccessors */ + /* @PropertyType=ResourceDictionary,ManagedDeclaringType=FrameworkElement,AutoCreateValue,ManagedFieldAccess=Internal,GenerateAccessors */ const static int ResourcesProperty; /* @PropertyType=object,ManagedDeclaringType=FrameworkElement,ManagedPropertyType=object,IsCustom=true */ const static int TagProperty; -- 2.11.4.GIT