[MonoDevelop] Patch: compile with latest gtk#

Fredrik Nilsson jymdman@home.se
Sat, 23 Apr 2005 11:28:26 +0200


--=-X6r+20GENdUp3TYjnb45
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Hi,

Small patch to compile with latest gtk# from svn.
Internal IconView conflicts with the one from gtk#

/Fredrik


--=-X6r+20GENdUp3TYjnb45
Content-Disposition: attachment; filename=iconview.diff
Content-Type: text/x-patch; name=iconview.diff; charset=UTF-8
Content-Transfer-Encoding: 7bit

Index: Core/src/MonoDevelop.Base/Gui/Dialogs/NewProjectDialog.cs
===================================================================
--- Core/src/MonoDevelop.Base/Gui/Dialogs/NewProjectDialog.cs	(revision 2468)
+++ Core/src/MonoDevelop.Base/Gui/Dialogs/NewProjectDialog.cs	(arbetskopia)
@@ -31,7 +31,7 @@
 		ArrayList alltemplates = new ArrayList();
 		ArrayList categories   = new ArrayList();
 		
-		IconView TemplateView;
+		MonoDevelop.Gui.Widgets.IconView TemplateView;
 		FolderEntry entry_location;
 		TreeStore catStore;
 		
@@ -294,7 +294,7 @@
 			
 			lst_template_types.Selection.Changed += new EventHandler (CategoryChange);
 			
-			TemplateView = new IconView();
+			TemplateView = new MonoDevelop.Gui.Widgets.IconView();
 
 			TreeViewColumn catColumn = new TreeViewColumn ();
 			catColumn.Title = "categories";
@@ -305,7 +305,7 @@
 
 			lst_template_types.AppendColumn (catColumn);
 
-			TemplateView = new IconView ();
+			TemplateView = new MonoDevelop.Gui.Widgets.IconView ();
 			hbox_template.PackStart (TemplateView, true, true, 0);
 
 			entry_location = new FolderEntry (GettextCatalog.GetString ("Combine Location"));
Index: Core/src/MonoDevelop.Base/Gui/Dialogs/NewFileDialog.cs
===================================================================
--- Core/src/MonoDevelop.Base/Gui/Dialogs/NewFileDialog.cs	(revision 2468)
+++ Core/src/MonoDevelop.Base/Gui/Dialogs/NewFileDialog.cs	(arbetskopia)
@@ -37,7 +37,7 @@
 		TreeStore templateStore;
 		Gtk.TreeView catView;
 		Gtk.TreeView templateView;
-		IconView TemplateView;
+		MonoDevelop.Gui.Widgets.IconView TemplateView;
 		Button okButton;
 		Button cancelButton;
 		Label infoLabel;
@@ -296,7 +296,7 @@
 			catView.WidthRequest = 160;
 			catView.HeadersVisible = false;
 			templateView = new Gtk.TreeView (templateStore);
-			TemplateView = new IconView();
+			TemplateView = new MonoDevelop.Gui.Widgets.IconView();
 
 			TreeViewColumn catColumn = new TreeViewColumn ();
 			catColumn.Title = "categories";

--=-X6r+20GENdUp3TYjnb45--