Pilz.NET/Pilz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make some projects compatible with netframework4.8 again

Browse Source
This commit is contained in:
Pascal
2025-02-11 07:18:14 +01:00
parent f08c94908a
commit 07ab60666a
32 changed files with 57 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Pilz.UI/PaintingControl/PaintingControl.cs
View File

@@ -1,5 +1,4 @@
using Microsoft.VisualBasic.CompilerServices;
using Pilz.Drawing;
using Pilz.Drawing;
using System;
using System.Collections;
using System.Collections.Generic;
@@ -94,7 +93,7 @@ public class PaintingControl : UserControl, IPaintingObjectContainer
{
get
{
return Conversions.ToInteger(GetType().GetField("layoutSuspendCount", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic).GetValue(this)) != 0;
return Convert.ToInt32(GetType().GetField("layoutSuspendCount", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic).GetValue(this)) != 0;
}
}
@@ -545,8 +544,8 @@ public class PaintingControl : UserControl, IPaintingObjectContainer
/// <param name="m"></param>
protected override void WndProc(ref Message m)
{
const int WM_NCHITTEST = 0x84;
const int HTTRANSPARENT = -1;
const nint WM_NCHITTEST = 0x84;
const nint HTTRANSPARENT = -1;
if (!VisibleForMouseEvents && m.Msg == WM_NCHITTEST)
m.Result = HTTRANSPARENT;

5
Pilz.UI/PaintingControl/PaintingObject.cs
View File

@@ -1,5 +1,4 @@
using Microsoft.VisualBasic.CompilerServices;
using Newtonsoft.Json;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -590,7 +589,7 @@ public class PaintingObject : ICloneable, IPaintingObjectContainer
get
{
if (Tag is string)
return Conversions.ToString(Tag);
return Convert.ToString(Tag);
else
{
return string.Empty;