*** empty log message ***

4 files changed, 43 insertions, 9 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os.cpp b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os.cpp
index b38cb92781..ae2160f975 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os.cpp
@@ -4893,15 +4893,28 @@ JNIEXPORT jint JNICALL OS_NATIVE(Geometry_1FillContainsWithDetail)
 }
 #endif
 
-#ifndef NO_Geometry_1GetFlattenedPathGeometry
-extern "C" JNIEXPORT jint JNICALL OS_NATIVE(Geometry_1GetFlattenedPathGeometry)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL OS_NATIVE(Geometry_1GetFlattenedPathGeometry)
+#ifndef NO_Geometry_1GetFlattenedPathGeometry__I
+extern "C" JNIEXPORT jint JNICALL OS_NATIVE(Geometry_1GetFlattenedPathGeometry__I)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT jint JNICALL OS_NATIVE(Geometry_1GetFlattenedPathGeometry__I)
 	(JNIEnv *env, jclass that, jint arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, Geometry_1GetFlattenedPathGeometry_FUNC);
+	OS_NATIVE_ENTER(env, that, Geometry_1GetFlattenedPathGeometry__I_FUNC);
 	rc = (jint)TO_HANDLE(((Geometry^)TO_OBJECT(arg0))->GetFlattenedPathGeometry());
-	OS_NATIVE_EXIT(env, that, Geometry_1GetFlattenedPathGeometry_FUNC);
+	OS_NATIVE_EXIT(env, that, Geometry_1GetFlattenedPathGeometry__I_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_Geometry_1GetFlattenedPathGeometry__IDI
+extern "C" JNIEXPORT jint JNICALL OS_NATIVE(Geometry_1GetFlattenedPathGeometry__IDI)(JNIEnv *env, jclass that, jint arg0, jdouble arg1, jint arg2);
+JNIEXPORT jint JNICALL OS_NATIVE(Geometry_1GetFlattenedPathGeometry__IDI)
+	(JNIEnv *env, jclass that, jint arg0, jdouble arg1, jint arg2)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, Geometry_1GetFlattenedPathGeometry__IDI_FUNC);
+	rc = (jint)TO_HANDLE(((Geometry^)TO_OBJECT(arg0))->GetFlattenedPathGeometry(arg1, (ToleranceType)arg2));
+	OS_NATIVE_EXIT(env, that, Geometry_1GetFlattenedPathGeometry__IDI_FUNC);
 	return rc;
 }
 #endif
@@ -7379,6 +7392,19 @@ JNIEXPORT jint JNICALL OS_NATIVE(PathGeometry_1Bounds)
 }
 #endif
 
+#ifndef NO_PathGeometry_1Clone
+extern "C" JNIEXPORT jint JNICALL OS_NATIVE(PathGeometry_1Clone)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT jint JNICALL OS_NATIVE(PathGeometry_1Clone)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, PathGeometry_1Clone_FUNC);
+	rc = (jint)TO_HANDLE(((PathGeometry^)TO_OBJECT(arg0))->Clone());
+	OS_NATIVE_EXIT(env, that, PathGeometry_1Clone_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_PathGeometry_1Figures__I
 extern "C" JNIEXPORT jint JNICALL OS_NATIVE(PathGeometry_1Figures__I)(JNIEnv *env, jclass that, jint arg0);
 JNIEXPORT jint JNICALL OS_NATIVE(PathGeometry_1Figures__I)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_stats.cpp b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_stats.cpp
index a4e6d89d22..3367f1c758 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_stats.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_stats.cpp
@@ -14,8 +14,8 @@
 
 #ifdef NATIVE_STATS
 
-int OS_nativeFunctionCount = 1285;
-int OS_nativeFunctionCallCount[1285];
+int OS_nativeFunctionCount = 1287;
+int OS_nativeFunctionCallCount[1287];
 char * OS_nativeFunctionNames[] = {
 	"AccessText_1AccessKey",
 	"AccessText_1Text",
@@ -420,7 +420,8 @@ char * OS_nativeFunctionNames[] = {
 	"Geometry_1Clone",
 	"Geometry_1FillContains",
 	"Geometry_1FillContainsWithDetail",
-	"Geometry_1GetFlattenedPathGeometry",
+	"Geometry_1GetFlattenedPathGeometry__I",
+	"Geometry_1GetFlattenedPathGeometry__IDI",
 	"Geometry_1IsEmpty",
 	"Geometry_1StrokeContains",
 	"Geometry_1Transform__I",
@@ -626,6 +627,7 @@ char * OS_nativeFunctionNames[] = {
 	"PathFigure_1StartPoint",
 	"PathGeometry_1AddGeometry",
 	"PathGeometry_1Bounds",
+	"PathGeometry_1Clone",
 	"PathGeometry_1Figures__I",
 	"PathGeometry_1Figures__II",
 	"PathGeometry_1FillRule",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_stats.h
index 66634d5153..d350a4efb8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_stats.h
@@ -428,7 +428,8 @@ typedef enum {
 	Geometry_1Clone_FUNC,
 	Geometry_1FillContains_FUNC,
 	Geometry_1FillContainsWithDetail_FUNC,
-	Geometry_1GetFlattenedPathGeometry_FUNC,
+	Geometry_1GetFlattenedPathGeometry__I_FUNC,
+	Geometry_1GetFlattenedPathGeometry__IDI_FUNC,
 	Geometry_1IsEmpty_FUNC,
 	Geometry_1StrokeContains_FUNC,
 	Geometry_1Transform__I_FUNC,
@@ -634,6 +635,7 @@ typedef enum {
 	PathFigure_1StartPoint_FUNC,
 	PathGeometry_1AddGeometry_FUNC,
 	PathGeometry_1Bounds_FUNC,
+	PathGeometry_1Clone_FUNC,
 	PathGeometry_1Figures__I_FUNC,
 	PathGeometry_1Figures__II_FUNC,
 	PathGeometry_1FillRule_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/org/eclipse/swt/internal/wpf/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/org/eclipse/swt/internal/wpf/OS.java
index 6e01267b8b..5f532eb6ce 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/org/eclipse/swt/internal/wpf/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/org/eclipse/swt/internal/wpf/OS.java
@@ -357,6 +357,8 @@ public class OS extends C {
 	public static final int TextDecorationLocation_Underline = 0;
 	public static final int TextDecorationLocation_Strikethrough = 2;
 	
+	public static final int ToleranceType_Absolute = 0;
+	
 
 	/*
 	* Note that these GCHandles are leaked.
@@ -802,6 +804,7 @@ public static final native void GeometryCollection_Remove(int sender, int geomet
 public static final native int Geometry_Clone(int sender);
 public static final native int Geometry_Bounds(int sender);
 public static final native int Geometry_GetFlattenedPathGeometry(int sender);
+public static final native int Geometry_GetFlattenedPathGeometry(int sender, double tolerance, int type);
 public static final native boolean Geometry_IsEmpty(int sender);
 public static final native boolean Geometry_FillContains(int sender, int point);
 public static final native int Geometry_FillContainsWithDetail(int sender, int geometry);
@@ -1018,6 +1021,7 @@ public static final native int PathFigure_Segments(int sender);
 public static final native int PathFigure_Segments(int sender, int index);
 public static final native void PathGeometry_AddGeometry(int sender, int geometry);
 public static final native int PathGeometry_Bounds(int sender);
+public static final native int PathGeometry_Clone(int sender);
 public static final native void PathGeometry_FillRule(int sender, int value);
 public static final native int PathGeometry_Figures(int sender);
 public static final native int PathGeometry_Figures(int sender, int index);