More Gdk.Pixbuf replacements

2 files changed, 8 insertions, 9 deletions

diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ComponentSelectorDialog.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ComponentSelectorDialog.cs
index 0312027ecf..a257f5a9ca 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ComponentSelectorDialog.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ComponentSelectorDialog.cs
@@ -63,7 +63,7 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 			
 			this.Build();
 			
-			store = new TreeStore (typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(Gdk.Pixbuf), typeof(ItemToolboxNode), typeof(bool), typeof(int));
+			store = new TreeStore (typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(Xwt.Drawing.Image), typeof(ItemToolboxNode), typeof(bool), typeof(int));
 			
 			TreeViewColumn col;
 			col = new TreeViewColumn ();
@@ -78,12 +78,12 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 			col = new TreeViewColumn ();
 			col.Spacing = 3;
 			col.Title = GettextCatalog.GetString ("Name");
-			var crp = new CellRendererPixbuf ();
+			var crp = new CellRendererImage ();
 			CellRendererText crx = new CellRendererText ();
 			crx.Width = 150;
 			col.PackStart (crp, false);
 			col.PackStart (crx, false);
-			col.AddAttribute (crp, "pixbuf", ColIcon);
+			col.AddAttribute (crp, "image", ColIcon);
 			col.AddAttribute (crp, "visible", ColShowCheck);
 			col.AddAttribute (crx, "text", ColName);
 			col.AddAttribute (crx, "weight", ColBold);
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs
index 1e3db6023f..ec6c64ee6b 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs
@@ -46,8 +46,8 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 		bool listMode       = false;
 		int mouseX, mouseY;
 		Pango.FontDescription desc;
-		Gdk.Pixbuf discloseDown;
-		Gdk.Pixbuf discloseUp;
+		Xwt.Drawing.Image discloseDown;
+		Xwt.Drawing.Image discloseUp;
 		Gdk.Cursor handCursor;
 		
 		const uint animationTimeSpan = 10;
@@ -148,8 +148,8 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 				           EventMask.KeyPressMask | 
 					       EventMask.PointerMotionMask;
 			this.CanFocus = true;
-			discloseDown = ImageService.GetPixbuf ("md-disclose-arrow-down", Gtk.IconSize.Menu);
-			discloseUp = ImageService.GetPixbuf ("md-disclose-arrow-up", Gtk.IconSize.Menu);
+			discloseDown = ImageService.GetIcon ("md-disclose-arrow-down", Gtk.IconSize.Menu);
+			discloseUp = ImageService.GetIcon ("md-disclose-arrow-up", Gtk.IconSize.Menu);
 			handCursor = new Cursor (CursorType.Hand1);
 		}
 
@@ -273,8 +273,7 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 				Pango.CairoHelper.ShowLayout (cr, headerLayout);
 
 				var img = category.IsExpanded ? discloseUp : discloseDown;
-				Gdk.CairoHelper.SetSourcePixbuf (cr, img, Allocation.Width - img.Width - CategoryRightPadding, ypos + (itemDimension.Height - img.Height) / 2);
-				cr.Paint ();
+				cr.DrawImage (this, img, Allocation.Width - img.Width - CategoryRightPadding, ypos + (itemDimension.Height - img.Height) / 2);
 
 				lastCategory = category;
 				lastCategoryYpos = ypos + itemDimension.Height;