[Monodevelop-patches-list] r1395 - in trunk/MonoDevelop/src/Main/Base: . Gui/BrowserDisplayBinding Gui/Workbench

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

Author: tberman
Date: 2004-04-06 01:27:44 -0400 (Tue, 06 Apr 2004)
New Revision: 1395

Modified:
   trunk/MonoDevelop/src/Main/Base/ChangeLog
   trunk/MonoDevelop/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs
   trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs
Log:
misc fixes


Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-06 03:05:49 UTC (rev 1394)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-06 05:27:44 UTC (rev 1395)
@@ -1,3 +1,10 @@
+2004-04-04  Todd Berman  <tberman at sevenl.net>
+
+	* Gui/Workbench/DefaultWorkbench.cs: register gtype. add message about
+	using proper ctor.
+	* Gui/BrowserDisplayBinding/HtmlViewPane.cs: remove useless event
+	box.
+
 2004-04-04  John Luke  <jluke at cfl.rr.com>
 
 	* Gui/BrowserDisplayBinding/HtmlViewPane.cs:

Modified: trunk/MonoDevelop/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs	2004-04-06 03:05:49 UTC (rev 1394)
+++ trunk/MonoDevelop/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs	2004-04-06 05:27:44 UTC (rev 1395)
@@ -133,7 +133,6 @@
 	public class HtmlViewPane : Gtk.Frame
 	{
 		MozillaControl htmlControl = null;
-		public Gtk.EventBox catcher = null;
 		
 		VBox topPanel = new VBox (false, 2);
 		Toolbar toolBar = new Toolbar ();
@@ -205,11 +204,9 @@
 			htmlControl.NetStart += new EventHandler (OnNetStart);
 			htmlControl.NetStop += new EventHandler (OnNetStop);
 			htmlControl.ShowAll ();
+			
+			mainbox.PackStart (htmlControl);
 
-			catcher = new Gtk.EventBox ();
-			catcher.Add (htmlControl);
-			mainbox.PackStart (catcher);
-
 			status = new Statusbar ();
 			status.HasResizeGrip  = false;
 			mainbox.PackStart (status, false, true, 0);

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs	2004-04-06 03:05:49 UTC (rev 1394)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs	2004-04-06 05:27:44 UTC (rev 1395)
@@ -1,7 +1,7 @@
 // <file>
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
-//     <owner name="Mike Krüger" email="mike at icsharpcode.net"/>
+//     <owner name="Mike Kr�¼ger" email="mike at icsharpcode.net"/>
 //     <version value="$version"/>
 // </file>
 
@@ -23,6 +23,8 @@
 
 using MonoDevelop.Services;
 
+using GLib;
+
 namespace MonoDevelop.Gui
 {
 	/// <summary>
@@ -45,6 +47,8 @@
 		Rectangle       normalBounds       = new Rectangle(0, 0, 640, 480);
 		
 		private IWorkbenchLayout layout = null;
+
+		static GType gtype;
 		
 		protected static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
 
@@ -118,9 +122,22 @@
 				return layout.ActiveWorkbenchwindow;
 			}
 		}
-		
-		public DefaultWorkbench() : base ("MonoDevelop")
+
+		public static new GLib.GType GType
 		{
+			get
+			{
+				if (gtype == GLib.GType.Invalid)
+					gtype = RegisterGType (typeof (DefaultWorkbench));
+				return gtype;
+			}
+		}
+
+		//FIXME: When it becomes possible, set this ctor to change ctor
+		//to the windowtype ctor with WindowType.TopLevel
+		public DefaultWorkbench() : base (GType)
+		{
+			Title = "MonoDevelop";
 			Console.WriteLine ("Creating DefaultWorkbench");
 			ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
 			// FIXME: edit the name in the resource