Skip to content

Commit b1c77f1

Browse files
Compatibility fix for HttpHandler for each object: Restore WebControl as a base class for GXHttpHandler in .NET Framework.
Keep methods PropagateCulture and Submit for .NET Framework GXWebProcedure.
1 parent 47a7e02 commit b1c77f1

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

dotnet/src/dotnetframework/GxClasses/Model/GXBaseObject.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ protected void Submit(Action<object> executeMethod, object state)
7272
{
7373
ThreadUtil.Submit(PropagateCulture(new WaitCallback(executeMethod)), state);
7474
}
75-
protected WaitCallback PropagateCulture(WaitCallback action)
75+
public static WaitCallback PropagateCulture(WaitCallback action)
7676
{
7777
var currentCulture = Thread.CurrentThread.CurrentCulture;
7878
GXLogging.Debug(log, "Submit PropagateCulture " + currentCulture);

dotnet/src/dotnetframework/GxClasses/Model/GXWebProcedure.cs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ public override void webExecute() { }
3838
public override void initialize() { }
3939
protected override void createObjects() { }
4040
public override void skipLines(long nToSkip) { }
41+
4142
public override void cleanup()
4243
{
4344
if (!context.WillRedirect() && context.IsLocalStorageSupported())
@@ -221,6 +222,15 @@ protected void GxDrawDynamicBitMap(int printBlock, int controlId, string value,
221222
{
222223
reportMetadata.GxDrawBitMap(printBlock, controlId, line, value, aspectRatio);
223224
}
224-
225+
#if !NETCORE
226+
protected static WaitCallback PropagateCulture(WaitCallback action)
227+
{
228+
return GXProcedure.PropagateCulture(action);
229+
}
230+
protected void Submit(Action<object> executeMethod, object state)
231+
{
232+
ThreadUtil.Submit(PropagateCulture(new WaitCallback(executeMethod)), state);
233+
}
234+
#endif
225235
}
226236
}

0 commit comments

Comments
 (0)