From 3fec7ca60a37d7b3eb341ce25af569236067bbc8 Mon Sep 17 00:00:00 2001
From: Joe Shaw <joe@joeshaw.org>
Date: Wed, 8 May 2002 11:52:21 +0000
Subject: [PATCH] 2002-05-08  Joe Shaw  <joe@assbarn.com>

	* */Makefile.in: Don't allow the shell to do file globbing; makes
	--recurse work.

	* generator/ObjectGen.cs (GenProperty): We need to cast a GLib.Value
	to a GLib.Object and then to whatever it is, because explicit casts
	don't work to child classes.
	(GenSignal): Append "EventHandler" when generating signal handlers
	so we don't get symbol conflicts.

svn path=/trunk/gtk-sharp/; revision=4414
---
 ChangeLog              | 11 +++++++++++
 atk/Makefile.in        |  2 +-
 gdk/Makefile.in        |  2 +-
 generator/ObjectGen.cs |  4 +++-
 glib/Makefile.in       |  2 +-
 gtk/Makefile.in        |  2 +-
 pango/Makefile.in      |  2 +-
 7 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 134524889..d0a915fe6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2002-05-08  Joe Shaw  <joe@assbarn.com>
+
+	* */Makefile.in: Don't allow the shell to do file globbing; makes
+	--recurse work.
+
+	* generator/ObjectGen.cs (GenProperty): We need to cast a GLib.Value
+	to a GLib.Object and then to whatever it is, because explicit casts
+	don't work to child classes.
+	(GenSignal): Append "EventHandler" when generating signal handlers
+	so we don't get symbol conflicts.
+
 2002-05-07  Mike Kestner <mkestner@speakeasy.net>
 
 	* generator/SymbolTable.cs : map char to string. 
diff --git a/atk/Makefile.in b/atk/Makefile.in
index 521478619..b7bef18c0 100644
--- a/atk/Makefile.in
+++ b/atk/Makefile.in
@@ -8,7 +8,7 @@ windows:
 linux: atk-sharp.dll
 
 atk-sharp.dll: generated/*.cs
-	$(MCS) --unsafe --target library -L ../glib -L ../pango -r glib-sharp -r pango-sharp -o atk-sharp.dll --recurse *.cs
+	$(MCS) --unsafe --target library -L ../glib -L ../pango -r glib-sharp -r pango-sharp -o atk-sharp.dll --recurse '*.cs'
 
 clean:
 	rm -f *.dll
diff --git a/gdk/Makefile.in b/gdk/Makefile.in
index e38d74163..1cda50eb8 100755
--- a/gdk/Makefile.in
+++ b/gdk/Makefile.in
@@ -8,7 +8,7 @@ windows:
 linux: gdk-sharp.dll
 
 gdk-sharp.dll: generated/*.cs
-	$(MCS) --unsafe --target library -L ../glib -L ../pango -L ../atk -r glib-sharp -r pango-sharp -r atk-sharp -o gdk-sharp.dll --recurse *.cs
+	$(MCS) --unsafe --target library -L ../glib -L ../pango -L ../atk -r glib-sharp -r pango-sharp -r atk-sharp -o gdk-sharp.dll --recurse '*.cs'
 
 clean:
 	rm -f *.dll
diff --git a/generator/ObjectGen.cs b/generator/ObjectGen.cs
index be1be0c58..b3acfc973 100644
--- a/generator/ObjectGen.cs
+++ b/generator/ObjectGen.cs
@@ -184,6 +184,8 @@ namespace GtkSharp.Generation {
 				Console.Write("Interface property detected ");
 				Statistics.ThrottledCount++;
 				return true;
+			} else if (table.IsObject(c_type)) {
+				v_type = "GLib.Object";
 			}
 			
 			if (cs_type == "") {
@@ -229,7 +231,7 @@ namespace GtkSharp.Generation {
 		public bool GenSignal (XmlElement sig, SymbolTable table, StreamWriter sw, out String name)
 		{
 			String cname = "\"" + sig.GetAttribute("cname") + "\"";
-			name = sig.GetAttribute("name");
+			name = sig.GetAttribute("name") + "EventHandler";
 
 			String marsh = SignalHandler.GetName(sig, table);
 			if (marsh == "") {
diff --git a/glib/Makefile.in b/glib/Makefile.in
index cdfa7c467..544777bb5 100755
--- a/glib/Makefile.in
+++ b/glib/Makefile.in
@@ -8,7 +8,7 @@ windows:
 linux: glib-sharp.dll
 
 glib-sharp.dll: *.cs generated/*.cs
-	$(MCS) --unsafe --target library -o glib-sharp.dll --recurse *.cs
+	$(MCS) --unsafe --target library -o glib-sharp.dll --recurse '*.cs'
 
 clean:
 	rm -f *.dll
diff --git a/gtk/Makefile.in b/gtk/Makefile.in
index 79c5caf6f..8600fc524 100755
--- a/gtk/Makefile.in
+++ b/gtk/Makefile.in
@@ -8,7 +8,7 @@ windows:
 linux: gtk-sharp.dll
 
 gtk-sharp.dll: *.cs generated/*.cs
-	$(MCS) --unsafe --target library -L ../glib -L ../pango -L ../atk -L ../gdk -r glib-sharp -r pango-sharp -r atk-sharp -r gdk-sharp -o gtk-sharp.dll --recurse *.cs
+	$(MCS) --unsafe --target library -L ../glib -L ../pango -L ../atk -L ../gdk -r glib-sharp -r pango-sharp -r atk-sharp -r gdk-sharp -o gtk-sharp.dll --recurse '*.cs'
 
 clean:
 	rm -f *.dll
diff --git a/pango/Makefile.in b/pango/Makefile.in
index 22912b980..90aad8ede 100644
--- a/pango/Makefile.in
+++ b/pango/Makefile.in
@@ -8,7 +8,7 @@ windows:
 linux: pango-sharp.dll
 
 pango-sharp.dll: generated/*.cs
-	$(MCS) --unsafe --target library -L ../glib -r glib-sharp -o pango-sharp.dll --recurse *.cs
+	$(MCS) --unsafe --target library -L ../glib -r glib-sharp -o pango-sharp.dll --recurse '*.cs'
 
 clean:
 	rm -f *.dll