summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Henstridge <james@daa.com.au>2001-09-20 01:03:59 +0000
committerJames Henstridge <jamesh@src.gnome.org>2001-09-20 01:03:59 +0000
commit81c641919ef87853af58750d19df0d4bf5b7e135 (patch)
tree82f8686ed8455ee164ccd6e937def64aab5d7aed
parentace1b5579dd5ba2b1878ff6901ed00a6511e7b2f (diff)
downloadpygtk-81c641919ef87853af58750d19df0d4bf5b7e135.tar.gz
rename from new, so that the header is includable in C++ programs.PYGTK_1_99_1
2001-09-20 James Henstridge <james@daa.com.au> * pygobject.h (_PyGObject_Functions.newgobj): rename from new, so that the header is includable in C++ programs.
-rw-r--r--ChangeLog5
-rw-r--r--gobject/pygobject.h4
-rw-r--r--pygobject.h4
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index cab747c1..d52fbae6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-20 James Henstridge <james@daa.com.au>
+
+ * pygobject.h (_PyGObject_Functions.newgobj): rename from new, so
+ that the header is includable in C++ programs.
+
2001-09-19 Matt Wilson <msw@redhat.com>
* gtk/gtk.defs (gtk_message_dialog_new): define defaults
diff --git a/gobject/pygobject.h b/gobject/pygobject.h
index 16fd37ae..bbe38f7b 100644
--- a/gobject/pygobject.h
+++ b/gobject/pygobject.h
@@ -33,7 +33,7 @@ struct _PyGObject_Functions {
GType type, PyExtensionClass *ec, PyObject *bases);
void (* register_wrapper)(PyObject *self);
PyExtensionClass *(* lookup_class)(GType type);
- PyObject *(* new)(GObject *obj);
+ PyObject *(* newgobj)(GObject *obj);
GClosure *(* closure_new)(PyObject *callback, PyObject *extra_args,
PyObject *swap_data);
@@ -74,7 +74,7 @@ struct _PyGObject_Functions *_PyGObject_API;
#define pygobject_register_class (_PyGObject_API->register_class)
#define pygobject_register_wrapper (_PyGObject_API->register_wrapper)
#define pygobject_lookup_class (_PyGObject_API->lookup_class)
-#define pygobject_new (_PyGObject_API->new)
+#define pygobject_new (_PyGObject_API->newgobj)
#define pyg_closure_new (_PyGObject_API->closure_new)
#define pyg_type_from_object (_PyGObject_API->type_from_object)
#define pyg_type_wrapper_new (_PyGObject_API->type_wrapper_new)
diff --git a/pygobject.h b/pygobject.h
index 16fd37ae..bbe38f7b 100644
--- a/pygobject.h
+++ b/pygobject.h
@@ -33,7 +33,7 @@ struct _PyGObject_Functions {
GType type, PyExtensionClass *ec, PyObject *bases);
void (* register_wrapper)(PyObject *self);
PyExtensionClass *(* lookup_class)(GType type);
- PyObject *(* new)(GObject *obj);
+ PyObject *(* newgobj)(GObject *obj);
GClosure *(* closure_new)(PyObject *callback, PyObject *extra_args,
PyObject *swap_data);
@@ -74,7 +74,7 @@ struct _PyGObject_Functions *_PyGObject_API;
#define pygobject_register_class (_PyGObject_API->register_class)
#define pygobject_register_wrapper (_PyGObject_API->register_wrapper)
#define pygobject_lookup_class (_PyGObject_API->lookup_class)
-#define pygobject_new (_PyGObject_API->new)
+#define pygobject_new (_PyGObject_API->newgobj)
#define pyg_closure_new (_PyGObject_API->closure_new)
#define pyg_type_from_object (_PyGObject_API->type_from_object)
#define pyg_type_wrapper_new (_PyGObject_API->type_wrapper_new)