[Monodevelop-patches-list] r1302 - in trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets: . Tree

[commit-watcher at mono-cvs.ximian.com]

Author: tberman
Date: 2004-03-31 00:38:08 -0500 (Wed, 31 Mar 2004)
New Revision: 1302

Modified:
   trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog
   trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Tree/TreeNode.cs
   trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Tree/TreeView.cs
Log:
fix fix gtk+ 2.4 regression thing...

gotta love abi compat :)


Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog	2004-03-30 23:36:58 UTC (rev 1301)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog	2004-03-31 05:38:08 UTC (rev 1302)
@@ -1,3 +1,9 @@
+2004-03-31  Todd Berman  <tberman at sevenl.net>
+
+	* Tree/TreeNode.cs:
+	* Tree/TreeView.cs: Fixing gtk+ 2.4 regression with the change from enum to
+	integer. Using RenderIcon to workaround.
+
 2004-03-27  Todd Berman  <tberman at sevenl.net>
 
 	* Tree/TreeNodeCollection.cs: fix indentation

Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Tree/TreeNode.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Tree/TreeNode.cs	2004-03-30 23:36:58 UTC (rev 1301)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Tree/TreeNode.cs	2004-03-31 05:38:08 UTC (rev 1302)
@@ -95,7 +95,7 @@
 				return;
 			
 			TreeView.Model.SetValue (TreeIter, 0, text);
-			if (image != null)        TreeView.Model.SetValue (TreeIter, 1, image);
+			if (image != null)        TreeView.Model.SetValue (TreeIter, 1, TreeView.RenderIcon (image));
 			if (opened_image != null) TreeView.Model.SetValue (TreeIter, 3, TreeView.RenderIcon (opened_image));
 			if (closed_image != null) TreeView.Model.SetValue (TreeIter, 4, TreeView.RenderIcon (closed_image));
 		}

Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Tree/TreeView.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Tree/TreeView.cs	2004-03-30 23:36:58 UTC (rev 1301)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Tree/TreeView.cs	2004-03-31 05:38:08 UTC (rev 1302)
@@ -25,7 +25,7 @@
 			3 -- Expanded Icon
 			4 -- Unexpanded Icon
 			*/
-			store = new Gtk.TreeStore (typeof (string), typeof (string), typeof (TreeNode), typeof (Gdk.Pixbuf), typeof (Gdk.Pixbuf));
+			store = new Gtk.TreeStore (typeof (string), typeof (Gdk.Pixbuf), typeof (TreeNode), typeof (Gdk.Pixbuf), typeof (Gdk.Pixbuf));
 			this.Model = store;
 			this.canEdit = canEdit;
 
@@ -37,8 +37,7 @@
 
 			Gtk.CellRendererPixbuf pix_render = new Gtk.CellRendererPixbuf ();
 			complete_column.PackStart (pix_render, false);
-			complete_column.AddAttribute (pix_render, "stock_id", 1);
-			pix_render.StockSize = Gtk.IconSize.Menu;
+			complete_column.AddAttribute (pix_render, "pixbuf", 1);
 			// Sadly, gtk+ does not have support for stock being here :-(
 			complete_column.AddAttribute (pix_render, "pixbuf-expander-open", 3);
 			complete_column.AddAttribute (pix_render, "pixbuf-expander-closed", 4);
@@ -160,7 +159,7 @@
 			store.SetValue (it, 2, new_child);
 			
 			if (new_child.Text != null)        store.SetValue (it, 0, new_child.Text);
-			if (new_child.Image != null)       store.SetValue (it, 1, new_child.Image);
+			if (new_child.Image != null)       store.SetValue (it, 1, RenderIcon (new_child.Image));
 			if (new_child.OpenedImage != null) store.SetValue (it, 3, RenderIcon (new_child.OpenedImage));
 			if (new_child.ClosedImage != null) store.SetValue (it, 4, RenderIcon (new_child.ClosedImage));
 			
@@ -185,7 +184,7 @@
 			store.SetValue (it, 2, new_child);
 			
 			if (new_child.Text != null)        store.SetValue (it, 0, new_child.Text);
-			if (new_child.Image != null)       store.SetValue (it, 1, new_child.Image);
+			if (new_child.Image != null)       store.SetValue (it, 1, RenderIcon (new_child.Image));
 			if (new_child.OpenedImage != null) store.SetValue (it, 3, RenderIcon (new_child.OpenedImage));
 			if (new_child.ClosedImage != null) store.SetValue (it, 4, RenderIcon (new_child.ClosedImage));