handle the null constructor better.

2000-07-03  James Henstridge  <james@daa.com.au>

	* codegen/codegen.py (noconstructor): handle the null constructor
	better.

	* gtk/gtk-types.c (_pygtk_register_boxed_types): commented out the
	object implementations for types that have been converted to
	GObjects.

	* gtk/gtkobject-support.c: commented out some of this code to get
	it to compile again.  Also converted some functions over to GObject.

	* codegen/argtypes.py (EnumArg,FlagsArg): use the version from gobject.

	* gtk/gtkmodule.c: update

	* gtk/gtk.override: fix up the overrides for the new gdk.defs stuff.
	(GTK_TYPE_GDK_*): add some dummy defines to make things compile until
	the gdk-pixbuf enums are added to

	* codegen/argtypes.py (ObjectArg.write_param): use PyGObject
	rather than PyGtk_Object.

	* pygobject.h (pygobject_check): add check function.  Just a wrapper
	around ExtensionClassSubclassInstance.

	* codegen/codegen.py: updated to use PyGObject rather than
	PyGtk_Object.

	* gtk/gtk.defs: removed most of the stuff here so I can test out
	the gdk stuff.

1 files changed, 0 insertions, 36 deletions

diff --git a/gtk/pygtk-private.h b/gtk/pygtk-private.h
index c85016b5..5d5f1add 100644
--- a/gtk/pygtk-private.h
+++ b/gtk/pygtk-private.h
@@ -13,52 +13,33 @@
 #include "pygtk.h"
 
 /* type objects */
-extern PyExtensionClass PyGtkObject_Type;
 extern PyTypeObject PyGtkAccelGroup_Type;
-extern PyTypeObject PyGtkStyle_Type;
 extern PyTypeObject PyGdkFont_Type;
 extern PyTypeObject PyGdkColor_Type;
 extern PyTypeObject PyGdkEvent_Type;
-extern PyTypeObject PyGdkWindow_Type;
-extern PyTypeObject PyGdkGC_Type;
 extern PyTypeObject PyGdkVisual_Type;
-extern PyTypeObject PyGdkColormap_Type;
-extern PyTypeObject PyGdkDragContext_Type;
 extern PyTypeObject PyGtkSelectionData_Type;
 extern PyTypeObject PyGdkAtom_Type;
 extern PyTypeObject PyGdkCursor_Type;
 extern PyTypeObject PyGtkCTreeNode_Type;
 
 /* check the type of a PyObject */
-#define PyGtk_Check(v,base) (ExtensionClassSubclassInstance_Check(v,base))
 #define PyGtkAccelGroup_Check(v) ((v)->ob_type == &PyGtkAccelGroup_Type)
-#define PyGtkStyle_Check(v) ((v)->ob_type == &PyGtkStyle_Type)
 #define PyGdkFont_Check(v) ((v)->ob_type == &PyGdkFont_Type)
 #define PyGdkColor_Check(v) ((v)->ob_type == &PyGdkColor_Type)
 #define PyGdkEvent_Check(v) ((v)->ob_type == &PyGdkEvent_Type)
-#define PyGdkWindow_Check(v) ((v)->ob_type == &PyGdkWindow_Type)
-#define PyGdkBitmap_Check(v) ((v)->ob_type == &PyGdkWindow_Type)
-#define PyGdkGC_Check(v) ((v)->ob_type == &PyGdkGC_Type)
 #define PyGdkVisual_Check(v) ((v)->ob_type == &PyGdkVisual_Type)
-#define PyGdkColormap_Check(v) ((v)->ob_type == &PyGdkColormap_Type)
-#define PyGdkDragContext_Check(v) ((v)->ob_type == &PyGdkDragContext_Type)
 #define PyGtkSelectionData_Check(v) ((v)->ob_type == &PyGtkSelectionData_Type)
 #define PyGdkAtom_Check(v) ((v)->ob_type == &PyGdkAtom_Type)
 #define PyGdkCursor_Check(v) ((v)->ob_type == &PyGdkCursor_Type)
 #define PyGtkCTreeNode_Check(v) ((v)->ob_type == &PyGtkCTreeNode_Type)
 
 /* constructors for PyObject wrappers ... */
-PyObject *PyGtk_New(GtkObject *obj);
 PyObject *PyGtkAccelGroup_New(GtkAccelGroup *obj);
-PyObject *PyGtkStyle_New(GtkStyle *style);
 PyObject *PyGdkFont_New(GdkFont *font);
 PyObject *PyGdkColor_New(GdkColor *colour);
 PyObject *PyGdkEvent_New(GdkEvent *event);
-PyObject *PyGdkWindow_New(GdkWindow *window);
-PyObject *PyGdkGC_New(GdkGC *gc);
 PyObject *PyGdkVisual_New(GdkVisual *visual);
-PyObject *PyGdkColormap_New(GdkColormap *colourmap);
-PyObject *PyGdkDragContext_New(GdkDragContext *ctx);
 PyObject *PyGtkSelectionData_New(GtkSelectionData *data);
 PyObject *PyGdkAtom_New(GdkAtom atom);
 PyObject *PyGdkCursor_New(GdkCursor *cursor);
@@ -90,24 +71,7 @@ GtkArg *pygtk_dict_as_container_args(PyObject *dict, GtkType type,
 void pygtk_register_boxed(GtkType boxed_type,
 			  PyObject *(*fromarg)(gpointer boxed),
 			  int (*toarg)(gpointer *boxed, PyObject *obj));
-gint pygtk_enum_get_value(GtkType enum_type, PyObject *obj, int *val);
-gint pygtk_flag_get_value(GtkType enum_type, PyObject *obj, int *val);
 
 static gboolean PyGtk_FatalExceptions = FALSE;
 
-/* object support */
-void pygtk_register_class(PyObject *dict, const gchar *class_name,
-			  PyExtensionClass *ec, PyExtensionClass *parent);
-void pygtk_register_wrapper(PyObject *self);
-PyObject *pygtk_no_constructor(PyObject *self, PyObject *args);
-
-void      pygtk_dealloc(PyGtk_Object *self);
-PyObject *pygtk_getattr(PyGtk_Object *self, char *attr);
-int       pygtk_setattr(PyGtk_Object *self, char *attr, PyObject *val);
-int       pygtk_compare(PyGtk_Object *self, PyGtk_Object *v);
-long      pygtk_hash(PyGtk_Object *self);
-PyObject *pygtk_repr(PyGtk_Object *self);
-
-extern PyMethodChain base_object_method_chain;
-
 #endif