diff options
author | James Henstridge <james@daa.com.au> | 2001-05-28 01:36:14 +0000 |
---|---|---|
committer | James Henstridge <jamesh@src.gnome.org> | 2001-05-28 01:36:14 +0000 |
commit | 4a55f849dd5f72163be3e30f5ff6df3bba95c185 (patch) | |
tree | bcc2d8c389e0a53701c39d0cfeec75e4ae038656 | |
parent | 4eb6811648e5719691c913bfb8347eb9a541db7a (diff) | |
download | pygtk-4a55f849dd5f72163be3e30f5ff6df3bba95c185.tar.gz |
interfaces don't have parents.
2001-05-27 James Henstridge <james@daa.com.au>
* codegen/codegen.py (write_source): interfaces don't have
parents.
* codegen/definitions.py (InterfaceDef.write_defs): don't look for
(parent ...) sections in interface definitions.
* gtk/gtk.defs (Editable): interfaces don't have parents.
-rw-r--r-- | ChangeLog | 14 | ||||
-rw-r--r-- | codegen/codegen.py | 11 | ||||
-rw-r--r-- | codegen/definitions.py | 11 | ||||
-rw-r--r-- | gtk/gtk.defs | 1 |
4 files changed, 16 insertions, 21 deletions
@@ -1,3 +1,17 @@ +2001-05-27 James Henstridge <james@daa.com.au> + + * codegen/codegen.py (write_source): interfaces don't have + parents. + + * codegen/definitions.py (InterfaceDef.write_defs): don't look for + (parent ...) sections in interface definitions. + + * gtk/gtk.defs (Editable): interfaces don't have parents. + +2001-05-07 James Henstridge <james@daa.com.au> + + * examples/gobject/signal.py: register new types. + 2001-05-06 James Henstridge <james@daa.com.au> * gobjectmodule.c (pygobject__init__): make the __init__ function diff --git a/codegen/codegen.py b/codegen/codegen.py index 30bf14ce..1361eba1 100644 --- a/codegen/codegen.py +++ b/codegen/codegen.py @@ -450,15 +450,8 @@ def write_source(parser, overrides, prefix, fp=sys.stdout): fp.write(' ExtensionClassImported;\n') fp.write(overrides.get_init() + '\n') for interface in parser.interfaces: - if interface.parent != (None, None): - fp.write(' PyExtensionClass_ExportSubclassSingle(d, "' + - interface.c_name + '", Py' + interface.c_name + - '_Type, Py' + interface.parent[1] + interface.parent[0] + - '_Type);\n') - else: - fp.write(' PyExtensionClass_Export(d, "' + - interface.c_name + '", Py' + interface.c_name + - '_Type);\n') + fp.write(' PyExtensionClass_Export(d, "' + interface.c_name + + '", Py' + interface.c_name + '_Type);\n') for obj in parser.objects: bases = [] if obj.parent != (None, None): diff --git a/codegen/definitions.py b/codegen/definitions.py index 3fc471cc..f7234983 100644 --- a/codegen/definitions.py +++ b/codegen/definitions.py @@ -67,29 +67,18 @@ class InterfaceDef(Definition): self.name = name self.module = None self.c_name = None - self.parent = (None, None) self.fields = [] for arg in args: if type(arg) != type(()) or len(arg) < 2: continue if arg[0] == 'in-module': self.module = arg[1] - elif arg[0] == 'parent': - if len(arg) > 2: - self.parent = (arg[1], arg[2][0]) - else: - self.parent = (arg[1], None) elif arg[0] == 'c-name': self.c_name = arg[1] def write_defs(self, fp=sys.stdout): fp.write('(interface ' + self.name + '\n') if self.module: fp.write(' (in-module ' + self.module + ')\n') - if self.parent != (None, None): - fp.write(' (parent ' + self.parent[0]) - if self.parent[1]: - fp.write(' (' + self.parent[1] + ')') - fp.write(')\n') if self.c_name: fp.write(' (c-name ' + self.c_name + ')\n') fp.write(')\n\n') diff --git a/gtk/gtk.defs b/gtk/gtk.defs index 5c250506..7462bd32 100644 --- a/gtk/gtk.defs +++ b/gtk/gtk.defs @@ -13,7 +13,6 @@ (interface Editable (in-module Gtk) - (parent Widget (Gtk)) (c-name GtkEditable) ) |