Remove references to &PyInt_Type from static type struct initialization

	* gobject/pygflags.c, gobject/pygenum.c, gobject/gobjectmodule.c
	(initgobject): Remove references to &PyInt_Type from static type
	struct initialization and manually set it before PyType_Ready calls
	
	* makefile.msc, gtk/makefile.msc, gobject/makefile.msc: VC++ makefile
	changes for new directory layout

4 files changed, 86 insertions, 4 deletions

diff --git a/gobject/gobjectmodule.c b/gobject/gobjectmodule.c
index 267ed2bf..4d888b86 100644
--- a/gobject/gobjectmodule.c
+++ b/gobject/gobjectmodule.c
@@ -2254,10 +2254,10 @@ initgobject(void)
 
     REGISTER_GTYPE(d, PyGBoxed_Type, "GBoxed", G_TYPE_BOXED);
     REGISTER_GTYPE(d, PyGPointer_Type, "GPointer", G_TYPE_POINTER); 
-    REGISTER_GTYPE(d, PyGEnum_Type, "GEnum", G_TYPE_ENUM);
     PyGEnum_Type.tp_base = &PyInt_Type;
-    REGISTER_GTYPE(d, PyGFlags_Type, "GFlags", G_TYPE_FLAGS);
+    REGISTER_GTYPE(d, PyGEnum_Type, "GEnum", G_TYPE_ENUM);
     PyGFlags_Type.tp_base = &PyInt_Type;
+    REGISTER_GTYPE(d, PyGFlags_Type, "GFlags", G_TYPE_FLAGS);
 
     REGISTER_TYPE(d, PyGMainLoop_Type, "GMainLoop"); 
     REGISTER_TYPE(d, PyGMainContext_Type, "GMainContext"); 
diff --git a/gobject/makefile.msc b/gobject/makefile.msc
new file mode 100644
index 00000000..a671eb90
--- /dev/null
+++ b/gobject/makefile.msc
@@ -0,0 +1,82 @@
+TOP = ..\..\..
+!INCLUDE $(TOP)\glib\build\win32\make.msc
+
+#DEBUG=1
+
+PYTHON = c:\python23
+!IFNDEF DEBUG
+EXTRALIBS = $(PYTHON)\libs\python23.lib user32.lib
+!ELSE
+EXTRALIBS = $(PYTHON)\libs\python23_d.lib user32.lib
+PYD_POSTFIX = _d
+!ENDIF
+
+EXTRACFLAGS = -I$(PYTHON)\include
+MODULE_EXT = pyd
+
+MODULES = gobject
+
+sub-all: 
+	for %d in ($(MODULES)) do nmake -nologo -f makefile.msc sub-one THIS=%d
+
+sub-one :
+	nmake -nologo -f makefile.msc MODULE=$(THIS) $(THIS)$(PYD_POSTFIX).$(MODULE_EXT) OBJ_$(THIS)=1
+
+all : \
+	sub-all
+
+# nothing much configuarable below this line ...
+#################################################################
+
+.SUFFIXES: .defs .c .exe
+
+gtk.c : gtk.defs gtk.override
+gdk.c : gdk.defs gdk.override
+libglade.c : libglade.defs libglade.override
+
+.defs.c :
+	 $(PYTHON)\python ../codegen/codegen.py \
+	   $(PYGTK_CODEGEN_DEFINES) \
+	    --register ../pango-types.defs \
+	    --register ../atk-types.defs \
+	    --register ../gtk/gdk-types.defs \
+	    --register ../gtk/gtk-types.defs \
+	    --override $*.override \
+	    --errorfilename gen-$*.err \
+	    --prefix py$* $*.defs > gen-$*.c
+	copy gen-$*.c $*.c
+	del gen-$*.c
+
+LDFLAGS = /link /machine:ix86 $(LINKDEBUG)
+INSTALL = copy
+
+INCLUDES = \
+	-FImsvc_recommended_pragmas.h \
+	-DHAVE_CONFIG_H -I.. -I..\gobject -I. $(EXTRACFLAGS) \
+	$(GLIB_CFLAGS) $(GTK2_CFLAGS) $(PANGO_CFLAGS) \
+	-DGTK_ENABLE_BROKEN \
+	-DVERSION=\"1.99.8\"
+
+!IFDEF OBJ_gobject
+OBJECTS = \
+	gobjectmodule.obj \
+	pygboxed.obj \
+	pygobject.obj \
+	pygflags.obj \
+	pygenum.obj \
+	pygtype.obj
+!ENDIF
+
+!IFNDEF OBJECTS
+OBJECTS = \
+	$(MODULE).obj \
+	$(MODULE)module.obj
+!ENDIF
+
+$(MODULE)$(PYD_POSTFIX).$(MODULE_EXT) : $(OBJECTS) 
+	$(CC) $(CFLAGS) -LD -Fe$@ $(OBJECTS) $(LDFLAGS) $(EXTRALIBS) \
+	$(GTK2_LIBS) $(GDK_PIXBUF_LIBS) $(GLIB_LIBS) $(ATK_LIBS) /export:init$(MODULE)
+
+clean::
+	del *.pyc
+	del *.pyd
diff --git a/gobject/pygenum.c b/gobject/pygenum.c
index 350de973..9615f087 100644
--- a/gobject/pygenum.c
+++ b/gobject/pygenum.c
@@ -282,7 +282,7 @@ PyTypeObject PyGEnum_Type = {
 	0,					  /* tp_methods */
 	0,					  /* tp_members */
 	pyg_enum_getsets,			  /* tp_getset */
-	&PyInt_Type,  				  /* tp_base */
+	0,	  				  /* tp_base */
 	0,					  /* tp_dict */
 	0,					  /* tp_descr_get */
 	0,					  /* tp_descr_set */
diff --git a/gobject/pygflags.c b/gobject/pygflags.c
index f5f30918..e3816cb7 100644
--- a/gobject/pygflags.c
+++ b/gobject/pygflags.c
@@ -400,7 +400,7 @@ PyTypeObject PyGFlags_Type = {
 	0,					  /* tp_methods */
 	0,					  /* tp_members */
 	pyg_flags_getsets,			  /* tp_getset */
-	&PyInt_Type,  				  /* tp_base */
+	0,	  				  /* tp_base */
 	0,					  /* tp_dict */
 	0,					  /* tp_descr_get */
 	0,					  /* tp_descr_set */