From 5e298ce11aaf92117e97a4deb0d03ce5b348be6c Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Mon, 20 Dec 2004 18:01:55 +0000 Subject: [PATCH] 2004-12-20 Mike Kestner * generator/Property.cs : generate Interface properties. * gtk/ComboBox.custom : remove dup model prop. * gtk/TreeView.custom : remove dup model prop. svn path=/trunk/gtk-sharp/; revision=37985 --- ChangeLog | 6 ++++++ doc/en/Gtk/EntryCompletion.xml | 15 ++++++++++++++- doc/en/Gtk/TreeModelFilter.xml | 15 ++++++++++++++- doc/en/Gtk/TreeModelSort.xml | 13 +++++++++++++ generator/Property.cs | 18 ++---------------- gtk/ComboBox.custom | 18 ------------------ gtk/TreeView.custom | 18 ------------------ 7 files changed, 49 insertions(+), 54 deletions(-) diff --git a/ChangeLog b/ChangeLog index 97fa198e0..861241949 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-12-20 Mike Kestner + + * generator/Property.cs : generate Interface properties. + * gtk/ComboBox.custom : remove dup model prop. + * gtk/TreeView.custom : remove dup model prop. + 2004-12-20 Jeroen Zwartepoorte * gnomevfs/Makefile.am: diff --git a/doc/en/Gtk/EntryCompletion.xml b/doc/en/Gtk/EntryCompletion.xml index 270b36608..7cbfe142a 100644 --- a/doc/en/Gtk/EntryCompletion.xml +++ b/doc/en/Gtk/EntryCompletion.xml @@ -432,5 +432,18 @@ + + + Property + + Gtk.TreeModel + + + + Tree data model. + a + + + - \ No newline at end of file + diff --git a/doc/en/Gtk/TreeModelFilter.xml b/doc/en/Gtk/TreeModelFilter.xml index 6a4fd73de..992371c8f 100644 --- a/doc/en/Gtk/TreeModelFilter.xml +++ b/doc/en/Gtk/TreeModelFilter.xml @@ -1098,5 +1098,18 @@ in a for display. + + + Property + + Gtk.TreeModel + + + + Child tree data model. + a + + + - \ No newline at end of file + diff --git a/doc/en/Gtk/TreeModelSort.xml b/doc/en/Gtk/TreeModelSort.xml index 2c04be4df..7adbe9270 100644 --- a/doc/en/Gtk/TreeModelSort.xml +++ b/doc/en/Gtk/TreeModelSort.xml @@ -1143,5 +1143,18 @@ node is always the parent. + + + Property + + Gtk.TreeModel + + + + Tree data model. + a + + + diff --git a/generator/Property.cs b/generator/Property.cs index f8a6e4086..140681a8a 100644 --- a/generator/Property.cs +++ b/generator/Property.cs @@ -56,13 +56,6 @@ namespace GtkSharp.Generation { return false; } - if (table.IsInterface(c_type)) { - // FIXME: Handle interface props properly. - Console.Write("Interface property detected "); - Statistics.ThrottledCount++; - return false; - } - return true; } @@ -100,12 +93,7 @@ namespace GtkSharp.Generation { string v_type = ""; if (table.IsEnum(c_type)) { v_type = "(int) (GLib.EnumWrapper)"; - } else if (table.IsInterface(c_type)) { - // FIXME: Handle interface props properly. - Console.Write("Interface property detected "); - Statistics.ThrottledCount++; - return; - } else if (table.IsObject(c_type)) { + } else if (table.IsObject(c_type) || table.IsInterface (c_type)) { v_type = "(GLib.UnwrappedObject)"; } else if (table.IsBoxed (c_type)) { v_type = "(GLib.Boxed)"; @@ -164,11 +152,9 @@ namespace GtkSharp.Generation { } else if (elem.HasAttribute("readable")) { sw.WriteLine(indent + "get {"); sw.WriteLine(indent + "\tGLib.Value val = " + RawGetter (qpname) + ";"); - if (table.IsObject (c_type)) { + if (table.IsObject (c_type) || table.IsInterface (c_type)) { sw.WriteLine(indent + "\tSystem.IntPtr raw_ret = (System.IntPtr) {0} val;", v_type); sw.WriteLine(indent + "\t" + cs_type + " ret = " + table.FromNativeReturn(c_type, "raw_ret") + ";"); - if (!table.IsBoxed (c_type) && !table.IsObject (c_type)) - sw.WriteLine(indent + "\tif (ret == null) ret = new " + cs_type + "(raw_ret);"); } else if (table.IsOpaque (c_type) || table.IsBoxed (c_type)) { sw.WriteLine(indent + "\t" + cs_type + " ret = (" + cs_type + ") val;"); } else { diff --git a/gtk/ComboBox.custom b/gtk/ComboBox.custom index 9794cf7ec..bc2753c16 100644 --- a/gtk/ComboBox.custom +++ b/gtk/ComboBox.custom @@ -19,24 +19,6 @@ // Boston, MA 02111-1307, USA. -[DllImport("libgtk-win32-2.0-0.dll")] -static extern IntPtr gtk_combo_box_get_model (IntPtr raw); - -[DllImport("libgtk-win32-2.0-0.dll")] -static extern IntPtr gtk_combo_box_set_model (IntPtr raw, IntPtr raw_model); - -public Gtk.TreeModel Model { - get { - IntPtr raw_ret = gtk_combo_box_get_model (Handle); - Gtk.TreeModel ret = (Gtk.TreeModel) GLib.Object.GetObject (raw_ret, false); - return ret; - } - set { - gtk_combo_box_set_model (Handle, value.Handle); - } -} - - public void SetCellDataFunc (Gtk.CellRenderer renderer, Gtk.CellLayoutDataFunc func) { GtkSharp.CellLayoutDataFuncWrapper func_wrapper = null; diff --git a/gtk/TreeView.custom b/gtk/TreeView.custom index aebbdda9f..36c77da0b 100644 --- a/gtk/TreeView.custom +++ b/gtk/TreeView.custom @@ -56,24 +56,6 @@ } } - [DllImport("libgtk-win32-2.0-0.dll")] - static extern IntPtr gtk_tree_view_get_model (IntPtr raw); - - [DllImport("libgtk-win32-2.0-0.dll")] - static extern IntPtr gtk_tree_view_set_model (IntPtr raw, IntPtr raw_model); - - public Gtk.TreeModel Model { - get { - IntPtr raw_ret = gtk_tree_view_get_model (Handle); - Gtk.TreeModel ret = (Gtk.TreeModel) GLib.Object.GetObject (raw_ret, false); - return ret; - } - - set { - gtk_tree_view_set_model (Handle, value.Handle); - } - } - [DllImport("libgtk-win32-2.0-0.dll")] static extern bool gtk_tree_view_get_path_at_pos (IntPtr raw, int x,