Reverted last change: accidentally committed lot of irrelevant stuff

svn path=/trunk/; revision=2828

8 files changed, 39 insertions, 53 deletions

diff --git a/ChangeLog b/ChangeLog
index d3e119ff..ba7639b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,3 @@
-2007-06-16  Yevgen Muntyan  <muntyan@tamu.edu>
-
-	reviewed by: Gustavo J. A. M. Carneiro.
-
-	* codegen/argtypes.py: prepend const to const boxed return values
-	in generated code (#448111).
-
 2007-06-14  Sébastien Granjoux  <seb.sfo@free.fr>
 
 	reviewed and fixed by: Gustavo J. A. M. Carneiro.
diff --git a/Makefile.am b/Makefile.am
index dbc8a4ea..55083dbe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,10 +4,7 @@ if BUILD_GTK
   GTK_SUBDIR = gtk
 endif
 
-SUBDIRS = codegen . $(GTK_SUBDIR) examples tests
-if !OS_WIN32
-SUBDIRS += docs
-endif
+SUBDIRS = codegen . $(GTK_SUBDIR) examples tests docs
 
 PLATFORM_VERSION = 2.0
 
@@ -56,7 +53,7 @@ pkgpyexec_LTLIBRARIES =
 # linker flags
 common_ldflags = -module -avoid-version
 if PLATFORM_WIN32
-common_ldflags += -no-undefined -shrext ".pyd"
+common_ldflags += -no-undefined
 endif
 
 # atk module
@@ -66,7 +63,7 @@ CLEANFILES += atk.c
 EXTRA_DIST += $(ATK_DEFS) $(ATK_OVERRIDES)
 atk.c: $(ATK_DEFS) $(ATK_OVERRIDES)
 atk_la_CFLAGS = $(ATK_CFLAGS)
-atk_la_LIBADD = $(ATK_LIBS) $(PYTHON_LIBS)
+atk_la_LIBADD = $(ATK_LIBS)
 atk_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initatk
 atk_la_SOURCES = atkmodule.c
 nodist_atk_la_SOURCES = atk.c
@@ -81,7 +78,7 @@ CLEANFILES += pango.c
 EXTRA_DIST += $(PANGO_DEFS) pango.override
 pango.c: $(PANGO_DEFS) pango.override
 pango_la_CFLAGS = $(PANGO_CFLAGS)
-pango_la_LIBADD = $(PANGO_LIBS) $(PYTHON_LIBS)
+pango_la_LIBADD = $(PANGO_LIBS)
 pango_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initpango
 pango_la_SOURCES = pangomodule.c
 nodist_pango_la_SOURCES = pango.c
@@ -97,7 +94,7 @@ EXTRA_DIST += $(PANGOCAIRO_DEFS) pangocairo.override
 pangocairo.c: $(PANGOCAIRO_DEFS) pangocairo.override
 pangocairo_la_CFLAGS = $(PYCAIRO_CFLAGS) $(PANGOCAIRO_CFLAGS)
 pangocairo_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initpangocairo
-pangocairo_la_LIBADD = $(PANGOCAIRO_LIBS) $(PYTHON_LIBS)
+pangocairo_la_LIBADD = $(PANGOCAIRO_LIBS)
 pangocairo_la_SOURCES = pangocairomodule.c
 nodist_pangocairo_la_SOURCES = pangocairo.c
 if BUILD_PANGOCAIRO
diff --git a/atk-types.defs b/atk-types.defs
index 178abebf..becb6ed2 100644
--- a/atk-types.defs
+++ b/atk-types.defs
@@ -380,14 +380,14 @@
     '("window" "ATK_XY_WINDOW")
   )
 )
-; (define-flags HyperlinkStateFlags
-;   (in-module "Atk")
-;   (c-name "AtkHyperlinkStateFlags")
-;   (gtype-id "ATK_TYPE_HYPERLINK_STATE_FLAGS")
-;   (values
-;     '("e" "ATK_HYPERLINK_IS_INLINE")
-;   )
-; )
+(define-flags HyperlinkStateFlags
+  (in-module "Atk")
+  (c-name "AtkHyperlinkStateFlags")
+  (gtype-id "ATK_TYPE_HYPERLINK_STATE_FLAGS")
+  (values
+    '("e" "ATK_HYPERLINK_IS_INLINE")
+  )
+)
 
 (define-enum TextClipType
   (in-module "Atk")
diff --git a/atk.defs b/atk.defs
index f96b70a9..191b0f6d 100644
--- a/atk.defs
+++ b/atk.defs
@@ -2540,25 +2540,25 @@
   )
 )
 
-; (define-method get_bounded_ranges
-;   (of-object "AtkText")
-;   (c-name "atk_text_get_bounded_ranges")
-;   (return-type "AtkTextRange**")
-;   (parameters
-;     '("AtkTextRectangle*" "rect")
-;     '("AtkCoordType" "coord_type")
-;     '("AtkTextClipType" "x_clip_type")
-;     '("AtkTextClipType" "y_clip_type")
-;   )
-; )
-
-; (define-function text_free_ranges
-;   (c-name "atk_text_free_ranges")
-;   (return-type "none")
-;   (parameters
-;     '("AtkTextRange**" "ranges")
-;   )
-; )
+(define-method get_bounded_ranges
+  (of-object "AtkText")
+  (c-name "atk_text_get_bounded_ranges")
+  (return-type "AtkTextRange**")
+  (parameters
+    '("AtkTextRectangle*" "rect")
+    '("AtkCoordType" "coord_type")
+    '("AtkTextClipType" "x_clip_type")
+    '("AtkTextClipType" "y_clip_type")
+  )
+)
+
+(define-function text_free_ranges
+  (c-name "atk_text_free_ranges")
+  (return-type "none")
+  (parameters
+    '("AtkTextRange**" "ranges")
+  )
+)
 
 (define-method free
   (of-object "AtkAttributeSet")
diff --git a/autogen.sh b/autogen.sh
index 7d105284..51ae4903 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,12 +2,12 @@
 # Run this to generate all the initial makefiles, etc.
 
 srcdir=`dirname $0`
-srcdir=`cd $srcdir && pwd`
+test -z "$srcdir" && srcdir=.
 
 REQUIRED_AUTOMAKE_VERSION=1.8
 
 PKG_NAME="PyGTK"
-ACLOCAL_FLAGS="-I $srcdir/m4 $ACLOCAL_FLAGS"
+ACLOCAL_FLAGS="-I `pwd`/m4 $ACLOCAL_FLAGS"
 
 #name of package
 PKG_NAME=${PKG_NAME:-Package}
diff --git a/codegen/argtypes.py b/codegen/argtypes.py
index 54bd9d25..3f145baa 100644
--- a/codegen/argtypes.py
+++ b/codegen/argtypes.py
@@ -579,12 +579,8 @@ class BoxedArg(ArgType):
                '    return pyg_boxed_new(%(typecode)s, %(ret)s, %(copy)s, TRUE);'
     def write_return(self, ptype, ownsreturn, info):
         if ptype[-1] == '*':
-            decl_type = self.typename
+            info.varlist.add(self.typename, '*ret')
             ret = 'ret'
-            if ptype[:6] == 'const-':
-                decl_type = 'const ' + self.typename
-                ret = '(%s*) ret' % (self.typename,)
-            info.varlist.add(decl_type, '*ret')
         else:
             info.varlist.add(self.typename, 'ret')
             ret = '&ret'
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 3d01d808..2a5f19ec 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -37,7 +37,7 @@ pkginclude_HEADERS = pygtk.h
 # linker flags
 common_ldflags = -module -avoid-version
 if PLATFORM_WIN32
-common_ldflags += -no-undefined -shrext ".pyd"
+common_ldflags += -no-undefined
 endif
 
 # gtk module
@@ -115,7 +115,7 @@ gdk.c: gdk-types.defs gdk.defs $(GDK_OVERRIDES)
 gtk.c: gdk-types.defs gtk-types.defs gtk.defs gdk-types.defs $(GTK_OVERRIDES)
 _gtk_la_CFLAGS = $(PYCAIRO_CFLAGS) $(GTK_CFLAGS)
 _gtk_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gtk
-_gtk_la_LIBADD = $(GTK_LIBS) $(PYTHON_LIBS)
+_gtk_la_LIBADD = $(GTK_LIBS)
 _gtk_la_SOURCES = 		\
 	gtk-types.c 		\
 	gtkmodule.c 		\
@@ -139,7 +139,7 @@ CLEANFILES += libglade.c
 EXTRA_DIST += $(LIBGLADE_DEFS) libglade.override
 libglade.c: $(LIBGLADE_DEFS) libglade.override gdk-types.defs gtk-types.defs
 glade_la_CFLAGS = $(LIBGLADE_CFLAGS)
-glade_la_LIBADD = $(LIBGLADE_LIBS) $(PYTHON_LIBS)
+glade_la_LIBADD = $(LIBGLADE_LIBS)
 glade_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initglade
 glade_la_SOURCES = libglademodule.c
 nodist_glade_la_SOURCES = libglade.c
diff --git a/gtk/gtk-base.defs b/gtk/gtk-base.defs
index dfb4a478..9acc5578 100644
--- a/gtk/gtk-base.defs
+++ b/gtk/gtk-base.defs
@@ -26839,7 +26839,7 @@
   (of-object "GtkWidget")
   (return-type "none")
   (parameters
-    '("GtkStyle*" "previous_style" (null-ok))
+    '("GtkStyle*" "previous_style")
   )
 )
 (define-virtual direction_changed