Add new modifier to GetType on interface helper classes

gircore · Jul 22, 2024 · 858faeb · 858faeb
1 parent fe2ee83
commit 858faeb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/Generation/Generator/Renderer/Public/FunctionRenderer.cs b/src/Generation/Generator/Renderer/Public/FunctionRenderer.cs
@@ -9,6 +9,11 @@ namespace Generator.Renderer.Public;
 internal static class FunctionRenderer
 {
     public static string Render(GirModel.Function? function)
+    {
+        return Render(function, forceNewModifier: false);
+    }
+
+    public static string Render(GirModel.Function? function, bool forceNewModifier)
     {
         if (function is null)
             return string.Empty;
@@ -19,7 +24,7 @@ public static string Render(GirModel.Function? function)
         try
         {
             var parameters = ParameterToNativeExpression.Initialize(function.Parameters);
-            var newModifier = Function.HidesFunction(function) ? "new " : string.Empty;
+            var newModifier = (forceNewModifier || Function.HidesFunction(function)) ? "new " : string.Empty;
             return @$"
 {VersionAttribute.Render(function.Version)}
 public static {newModifier}{ReturnTypeRenderer.Render(function.ReturnType)} {Function.GetName(function)}({RenderParameters(parameters)})

diff --git a/...ion/Generator/Renderer/Public/InterfaceImplementation/InterfaceImplementationFunctions.cs b/...ion/Generator/Renderer/Public/InterfaceImplementation/InterfaceImplementationFunctions.cs
@@ -22,7 +22,8 @@ namespace {Namespace.GetPublicName(@interface.Namespace)};
 
 public partial class {Interface.GetImplementationName(@interface)} : GObject.GTypeProvider
 {{
-    {FunctionRenderer.Render(@interface.TypeFunction)}
+    // The implementation class also inherits from GObject.Object so GetType needs the new modifier
+    {FunctionRenderer.Render(@interface.TypeFunction, forceNewModifier: true)}
 
     {@interface.Functions
         .Select(FunctionRenderer.Render)