Skip to content

Commit a8340f6

Browse files
committed
Updated to 3.0.6 version.
1 parent 9a56efd commit a8340f6

File tree

4 files changed

+42
-6
lines changed

4 files changed

+42
-6
lines changed

Src/Noesis/Core/Src/Core/ExtendBoxing.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ private static Dictionary<Type, BoxDelegate> CreateBoxFunctions()
5555
boxFunctions[typeof(Noesis.CharacterCasing)] = (val) => NoesisGUI_.Box_CharacterCasing((Noesis.CharacterCasing)val);
5656
boxFunctions[typeof(Noesis.ClickMode)] = (val) => NoesisGUI_.Box_ClickMode((Noesis.ClickMode)val);
5757
boxFunctions[typeof(Noesis.ColorInterpolationMode)] = (val) => NoesisGUI_.Box_ColorInterpolationMode((Noesis.ColorInterpolationMode)val);
58+
boxFunctions[typeof(Noesis.Cursor)] = (val) => NoesisGUI_.Box_Cursor((Noesis.Cursor)val);
5859
boxFunctions[typeof(Noesis.Dock)] = (val) => NoesisGUI_.Box_Dock((Noesis.Dock)val);
5960
boxFunctions[typeof(Noesis.ExpandDirection)] = (val) => NoesisGUI_.Box_ExpandDirection((Noesis.ExpandDirection)val);
6061
boxFunctions[typeof(Noesis.FillRule)] = (val) => NoesisGUI_.Box_FillRule((Noesis.FillRule)val);
@@ -65,6 +66,8 @@ private static Dictionary<Type, BoxDelegate> CreateBoxFunctions()
6566
boxFunctions[typeof(Noesis.GeometryCombineMode)] = (val) => NoesisGUI_.Box_GeometryCombineMode((Noesis.GeometryCombineMode)val);
6667
boxFunctions[typeof(Noesis.GradientSpreadMethod)] = (val) => NoesisGUI_.Box_GradientSpreadMethod((Noesis.GradientSpreadMethod)val);
6768
boxFunctions[typeof(Noesis.HorizontalAlignment)] = (val) => NoesisGUI_.Box_HorizontalAlignment((Noesis.HorizontalAlignment)val);
69+
boxFunctions[typeof(Noesis.Key)] = (val) => NoesisGUI_.Box_Key((Noesis.Key)val);
70+
boxFunctions[typeof(Noesis.ModifierKeys)] = (val) => NoesisGUI_.Box_ModifierKeys((Noesis.ModifierKeys)val);
6871
boxFunctions[typeof(Noesis.KeyboardNavigationMode)] = (val) => NoesisGUI_.Box_KeyboardNavigationMode((Noesis.KeyboardNavigationMode)val);
6972
boxFunctions[typeof(Noesis.LineStackingStrategy)] = (val) => NoesisGUI_.Box_LineStackingStrategy((Noesis.LineStackingStrategy)val);
7073
boxFunctions[typeof(Noesis.ListSortDirection)] = (val) => NoesisGUI_.Box_ListSortDirection((Noesis.ListSortDirection)val);
@@ -77,10 +80,11 @@ private static Dictionary<Type, BoxDelegate> CreateBoxFunctions()
7780
boxFunctions[typeof(Noesis.PopupAnimation)] = (val) => NoesisGUI_.Box_PopupAnimation((Noesis.PopupAnimation)val);
7881
boxFunctions[typeof(Noesis.RelativeSourceMode)] = (val) => NoesisGUI_.Box_RelativeSourceMode((Noesis.RelativeSourceMode)val);
7982
boxFunctions[typeof(Noesis.SelectionMode)] = (val) => NoesisGUI_.Box_SelectionMode((Noesis.SelectionMode)val);
80-
boxFunctions[typeof(Noesis.CornerRadius)] = (val) => NoesisGUI_.Box_CornerRadius((Noesis.CornerRadius)val);
83+
boxFunctions[typeof(Noesis.ScrollBarVisibility)] = (val) => NoesisGUI_.Box_ScrollBarVisibility((Noesis.ScrollBarVisibility)val);
8184
boxFunctions[typeof(Noesis.Stretch)] = (val) => NoesisGUI_.Box_Stretch((Noesis.Stretch)val);
8285
boxFunctions[typeof(Noesis.StretchDirection)] = (val) => NoesisGUI_.Box_StretchDirection((Noesis.StretchDirection)val);
8386
boxFunctions[typeof(Noesis.TextAlignment)] = (val) => NoesisGUI_.Box_TextAlignment((Noesis.TextAlignment)val);
87+
boxFunctions[typeof(Noesis.TextDecorations)] = (val) => NoesisGUI_.Box_TextDecorations((Noesis.TextDecorations)val);
8488
boxFunctions[typeof(Noesis.TextTrimming)] = (val) => NoesisGUI_.Box_TextTrimming((Noesis.TextTrimming)val);
8589
boxFunctions[typeof(Noesis.TextWrapping)] = (val) => NoesisGUI_.Box_TextWrapping((Noesis.TextWrapping)val);
8690
boxFunctions[typeof(Noesis.TickBarPlacement)] = (val) => NoesisGUI_.Box_TickBarPlacement((Noesis.TickBarPlacement)val);

Src/Noesis/Core/Src/Proxies/NoesisGUI_.cs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -755,6 +755,26 @@ public static IntPtr Box_InputScope(InputScope val) {
755755
return ret;
756756
}
757757

758+
public static Key Unbox_Key(IntPtr val) {
759+
Key ret = (Key)NoesisGUI_PINVOKE.Unbox_Key(val);
760+
return ret;
761+
}
762+
763+
public static IntPtr Box_Key(Key val) {
764+
IntPtr ret = NoesisGUI_PINVOKE.Box_Key((int)val);
765+
return ret;
766+
}
767+
768+
public static ModifierKeys Unbox_ModifierKeys(IntPtr val) {
769+
ModifierKeys ret = (ModifierKeys)NoesisGUI_PINVOKE.Unbox_ModifierKeys(val);
770+
return ret;
771+
}
772+
773+
public static IntPtr Box_ModifierKeys(ModifierKeys val) {
774+
IntPtr ret = NoesisGUI_PINVOKE.Box_ModifierKeys((int)val);
775+
return ret;
776+
}
777+
758778
public static KeyboardNavigationMode Unbox_KeyboardNavigationMode(IntPtr val) {
759779
KeyboardNavigationMode ret = (KeyboardNavigationMode)NoesisGUI_PINVOKE.Unbox_KeyboardNavigationMode(val);
760780
return ret;

Src/Noesis/Core/Src/Proxies/NoesisGUI_PINVOKE.cs

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -997,6 +997,18 @@ internal class NoesisGUI_PINVOKE {
997997
[DllImport(Library.Name)]
998998
public static extern IntPtr Box_InputScope(int jarg1);
999999

1000+
[DllImport(Library.Name)]
1001+
public static extern int Unbox_Key(IntPtr jarg1);
1002+
1003+
[DllImport(Library.Name)]
1004+
public static extern IntPtr Box_Key(int jarg1);
1005+
1006+
[DllImport(Library.Name)]
1007+
public static extern int Unbox_ModifierKeys(IntPtr jarg1);
1008+
1009+
[DllImport(Library.Name)]
1010+
public static extern IntPtr Box_ModifierKeys(int jarg1);
1011+
10001012
[DllImport(Library.Name)]
10011013
public static extern int Unbox_KeyboardNavigationMode(IntPtr jarg1);
10021014

@@ -3327,10 +3339,10 @@ internal class NoesisGUI_PINVOKE {
33273339
public static extern void delete_MouseWheelEventArgs(HandleRef jarg1);
33283340

33293341
[DllImport(Library.Name)]
3330-
public static extern IntPtr new_TouchEventArgs(HandleRef jarg1, HandleRef jarg2, ref Point jarg3, ulong jarg4);
3342+
public static extern IntPtr TouchEventArgs_GetTouchPoint(HandleRef jarg1, HandleRef jarg2);
33313343

33323344
[DllImport(Library.Name)]
3333-
public static extern IntPtr TouchEventArgs_GetTouchPoint(HandleRef jarg1, HandleRef jarg2);
3345+
public static extern IntPtr new_TouchEventArgs(HandleRef jarg1, HandleRef jarg2, ref Point jarg3, ulong jarg4);
33343346

33353347
[DllImport(Library.Name)]
33363348
public static extern ulong TouchEventArgs_GetTouchDeviceId(HandleRef jarg1);

Src/Noesis/Core/Src/Proxies/TouchEventArgs.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@ public TouchDevice TouchDevice {
5757
}
5858
}
5959

60-
public TouchEventArgs(object source, RoutedEvent arg1, Point p, ulong device) : this(NoesisGUI_PINVOKE.new_TouchEventArgs(Noesis.Extend.GetInstanceHandle(source), RoutedEvent.getCPtr(arg1), ref p, device), true) {
61-
}
62-
6360
public Point GetTouchPoint(UIElement relativeTo) {
6461
IntPtr ret = NoesisGUI_PINVOKE.TouchEventArgs_GetTouchPoint(swigCPtr, UIElement.getCPtr(relativeTo));
6562
if (ret != IntPtr.Zero) {
@@ -70,6 +67,9 @@ public Point GetTouchPoint(UIElement relativeTo) {
7067
}
7168
}
7269

70+
public TouchEventArgs(object source, RoutedEvent arg1, Point p, ulong device) : this(NoesisGUI_PINVOKE.new_TouchEventArgs(Noesis.Extend.GetInstanceHandle(source), RoutedEvent.getCPtr(arg1), ref p, device), true) {
71+
}
72+
7373
private ulong GetTouchDeviceId() {
7474
ulong ret = NoesisGUI_PINVOKE.TouchEventArgs_GetTouchDeviceId(swigCPtr);
7575
return ret;

0 commit comments

Comments
 (0)