summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--examples/pygtk-demo/demos/treemodel.py4
-rw-r--r--gtk/gtk-extrafuncs.defs2
-rw-r--r--pygtk.spec.in3
4 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index fdac6c3a..31f560bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2001-10-09 James Henstridge <james@daa.com.au>
+ * gtk/gtk-extrafuncs.defs (GenericTreeModel): fix up c-name.
+
+ * examples/pygtk-demo/demos/treemodel.py (MyTreeModel): subclass
+ from gtk.GenericTreeModel.
+
+ * pygtk.spec.in (Requires): add new files to spec file.
+
+2001-10-09 James Henstridge <james@daa.com.au>
+
* pango-types.defs: move types.
* gtk/Makefile.am: modify rules to take into account splitting out
diff --git a/examples/pygtk-demo/demos/treemodel.py b/examples/pygtk-demo/demos/treemodel.py
index 7df3e2b7..4bf7f7a0 100644
--- a/examples/pygtk-demo/demos/treemodel.py
+++ b/examples/pygtk-demo/demos/treemodel.py
@@ -10,7 +10,7 @@ import gobject
# to create a new GtkTreeModel from python, you must derive from
# TreeModel.
-class MyTreeModel(gtk.TreeModel):
+class MyTreeModel(gtk.GenericTreeModel):
'''This class represents the model of a tree. The iterators used
to represent positions are converted to python objects when passed
to the on_* methods. This means you can use any python object to
@@ -27,7 +27,7 @@ class MyTreeModel(gtk.TreeModel):
def __init__(self):
'''constructor for the model. Make sure you call
PyTreeModel.__init__'''
- gtk.TreeModel.__init__(self)
+ gtk.GenericTreeModel.__init__(self)
# the implementations for TreeModel methods are prefixed with on_
def on_get_flags(self):
diff --git a/gtk/gtk-extrafuncs.defs b/gtk/gtk-extrafuncs.defs
index c72ea330..e9d45b28 100644
--- a/gtk/gtk-extrafuncs.defs
+++ b/gtk/gtk-extrafuncs.defs
@@ -43,7 +43,7 @@
(define-object GenericTreeModel
(in-module "PyGtk")
(parent "GObject")
- (c-name "GenericTreeModel")
+ (c-name "PyGtkGenericTreeModel")
(gtype-id "PYGTK_TYPE_GENERIC_TREE_MODEL")
(implements "GtkTreeModel")
)
diff --git a/pygtk.spec.in b/pygtk.spec.in
index ec663a08..275140a3 100644
--- a/pygtk.spec.in
+++ b/pygtk.spec.in
@@ -74,7 +74,10 @@ make DESTDIR=$RPM_BUILD_ROOT install
%dir %{_prefix}/share/pygtk/2.0/defs
%{_prefix}/share/pygtk/2.0/codegen/*
%{_prefix}/share/pygtk/2.0/defs/pango.defs
+%{_prefix}/share/pygtk/2.0/defs/pango-types.defs
%{_prefix}/share/pygtk/2.0/defs/gdk.defs
+%{_prefix}/share/pygtk/2.0/defs/gdk-types.defs
%{_prefix}/share/pygtk/2.0/defs/gtk.defs
+%{_prefix}/share/pygtk/2.0/defs/gtk-types.defs
%{_prefix}/share/pygtk/2.0/defs/gtk-extrafuncs.defs
%{_prefix}/share/pygtk/2.0/defs/libglade.defs