Merge branch 'master' into d2d

[apitrace] / specs / stdapi.py

diff --git a/specs/stdapi.py b/specs/stdapi.py
index 5ba621fff35ceb7e26df9d94d0d303240d77e68c..0e3fe236154d554276f9bf986168b1029b08b9b3 100644 (file)
--- a/specs/stdapi.py
+++ b/specs/stdapi.py
@@ -349,14 +349,29 @@ class Interface(Type):
         for method in self.methods:
             yield method
         raise StopIteration
+    
+    def iterBaseMethods(self):
+        if self.base is not None:
+            for iface, method in self.base.iterBaseMethods():
+                yield iface, method
+        for method in self.methods:
+            yield self, method
+        raise StopIteration
 
 
 class Method(Function):
 
-    def __init__(self, type, name, args):
+    def __init__(self, type, name, args, const=False):
         Function.__init__(self, type, name, args, call = '__stdcall')
         for index in range(len(self.args)):
             self.args[index].index = index + 1
+        self.const = const
+
+    def prototype(self, name=None):
+        s = Function.prototype(self, name)
+        if self.const:
+            s += ' const'
+        return s
 
 
 class String(Type):