2005-10-08 Mike Kestner <mkestner@novell.com>

* generator/Signal.cs : handle enum return values GTypes.
	* gtk/TextBuffer.custom : mark Text prop !GTK_SHARP_2_8.
	[Fixes #75885]

svn path=/trunk/gtk-sharp/; revision=51484
This commit is contained in:
Mike Kestner 2005-10-09 01:50:37 +00:00
parent 65c81a5cea
commit 880b1ff3e9
3 changed files with 11 additions and 1 deletions

View File

@ -1,3 +1,9 @@
2005-10-08 Mike Kestner <mkestner@novell.com>
* generator/Signal.cs : handle enum return values GTypes.
* gtk/TextBuffer.custom : mark Text prop !GTK_SHARP_2_8.
[Fixes #75885]
2005-10-08 Ben Maurer <bmaurer@ximian.com> 2005-10-08 Ben Maurer <bmaurer@ximian.com>
* glade/XML.custom: Do not look at inherited custom * glade/XML.custom: Do not look at inherited custom

View File

@ -168,12 +168,14 @@ namespace GtkSharp.Generation {
private string ReturnGType { private string ReturnGType {
get { get {
ClassBase igen = SymbolTable.Table.GetClassGen (retval.CType); IGeneratable igen = SymbolTable.Table [retval.CType];
if (igen is ObjectGen) if (igen is ObjectGen)
return "GLib.GType.Object"; return "GLib.GType.Object";
if (igen is BoxedGen) if (igen is BoxedGen)
return retval.CSType + ".GType"; return retval.CSType + ".GType";
if (igen is EnumGen)
return retval.CSType + "GType.GType";
switch (retval.CSType) { switch (retval.CSType) {
case "bool": case "bool":

View File

@ -22,6 +22,7 @@
[DllImport("libgtk-win32-2.0-0.dll")] [DllImport("libgtk-win32-2.0-0.dll")]
static extern void gtk_text_buffer_set_text (IntPtr raw, IntPtr text, int len); static extern void gtk_text_buffer_set_text (IntPtr raw, IntPtr text, int len);
#if !GTK_SHARP_2_8
public string Text { public string Text {
get { get {
return GetText (StartIter, EndIter, false); return GetText (StartIter, EndIter, false);
@ -32,6 +33,7 @@ public string Text {
GLib.Marshaller.Free (native); GLib.Marshaller.Free (native);
} }
} }
#endif
public void Clear () public void Clear ()
{ {