From 2071ae765de2fba07f5d82d2991fade8a5903c16 Mon Sep 17 00:00:00 2001
From: lojack5 <1458329+lojack5@users.noreply.github.com>
Date: Fri, 17 Jan 2025 03:18:41 -0700
Subject: [PATCH] Fixup: functions were being generated as if they were methods
 (had a 'self' parameter)

---
 etgtools/extractors.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/etgtools/extractors.py b/etgtools/extractors.py
index a7d6a30d..4f6cd265 100644
--- a/etgtools/extractors.py
+++ b/etgtools/extractors.py
@@ -281,6 +281,8 @@ class FunctionDef(BaseDef, FixWxPrefix):
     """
     Information about a standalone function.
     """
+    _default_method_type = MethodType.FUNCTION
+
     def __init__(self, element=None, **kw):
         super(FunctionDef, self).__init__()
         self.type = None
@@ -548,7 +550,7 @@ class FunctionDef(BaseDef, FixWxPrefix):
             return_type = returns[0]
         else:
             return_type = f"Tuple[{', '.join(returns)}]"
-        kind = MethodType.STATIC_METHOD if getattr(self, 'isStatic', False) else MethodType.METHOD
+        kind = MethodType.STATIC_METHOD if getattr(self, 'isStatic', False) else type(self)._default_method_type
         self.signature = Signature(name, *params, return_type=return_type, method_type=kind)
         self.pyArgsString = self.signature.args_string(False)
 
@@ -587,6 +589,8 @@ class MethodDef(FunctionDef):
     """
     Represents a class method, ctor or dtor declaration.
     """
+    _default_method_type = MethodType.METHOD
+
     def __init__(self, element=None, className=None, **kw):
         super(MethodDef, self).__init__()
         self.className = className
@@ -725,7 +729,6 @@ class ClassDef(BaseDef):
         self._convertFromPyObject = value.code
         name = self.name or self.pyName
         name = removeWxPrefix(name)
-        print('Registering:', name, value.convertables)
         FixWxPrefix.register_autoconversion(name, value.convertables)
 
     def is_top_level(self) -> bool: