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

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

Author: jluke
Date: 2004-04-04 22:38:33 -0400 (Sun, 04 Apr 2004)
New Revision: 1384

Modified:
   trunk/MonoDevelop/src/Main/Base/ChangeLog
   trunk/MonoDevelop/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs
Log:
* Gui/BrowserDisplayBinding/HtmlViewPane.cs: register the GType
to fix weirdness


Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-05 00:59:54 UTC (rev 1383)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-05 02:38:33 UTC (rev 1384)
@@ -8,6 +8,8 @@
 	* Gui/Dialogs/SharpDevelopAboutPanels.cs: call Path.GetFullPath
 	on assembly location to get rid of '../AddIn/..' stuff
 	send the text to the X clipboard also
+	* Gui/BrowserDisplayBinding/HtmlViewPane.cs: register the GType
+	to fix weirdness
 
 2004-04-04  Todd Berman  <tberman at sevenl.net>
 

Modified: trunk/MonoDevelop/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs	2004-04-05 00:59:54 UTC (rev 1383)
+++ trunk/MonoDevelop/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs	2004-04-05 02:38:33 UTC (rev 1384)
@@ -7,13 +7,10 @@
 
 using System;
 using Gtk;
-using GtkSharp;
 using Gecko;
 
 using MonoDevelop.Internal.Undo;
-using System.Drawing.Printing;
 using MonoDevelop.Core.Properties;
-
 using MonoDevelop.Core.Services;
 using MonoDevelop.Core.AddIns.Codons;
 using MonoDevelop.Gui;
@@ -102,13 +99,13 @@
 		{
 		}
 
-		public BrowserPane(bool showNavigation) //: base (type)
+		public BrowserPane (bool showNavigation) // : base (GType)
 		{
 			htmlViewPane = new HtmlViewPane(showNavigation);
 			htmlViewPane.MozillaControl.TitleChange += new EventHandler (OnTitleChanged);
 		}
 		
-		public BrowserPane() : this(true)
+		public BrowserPane () : this(true)
 		{
 		}
 		
@@ -138,14 +135,14 @@
 		MozillaControl htmlControl = null;
 		public Gtk.EventBox catcher = null;
 		
-		VBox   topPanel   = new VBox (false, 2);
-		Toolbar toolBar    = new Toolbar ();
+		VBox topPanel = new VBox (false, 2);
+		Toolbar toolBar = new Toolbar ();
 		Entry urlTextBox = new Entry ();
 		Statusbar status;
 		
-		bool   isHandleCreated  = false;
-		string lastUrl     = null;
-		static GLib.GType type;
+		bool isHandleCreated = false;
+		string lastUrl = null;
+		static GLib.GType gtype;
 		
 		public MozillaControl MozillaControl {
 			get {
@@ -153,12 +150,17 @@
 			}
 		}
 		
-		static HtmlViewPane ()
+		public static new GLib.GType GType
 		{
-			type = RegisterGType (typeof (HtmlViewPane));
+			get
+			{
+				if (gtype == GLib.GType.Invalid)
+					gtype = RegisterGType (typeof (HtmlViewPane));
+				return gtype;
+			}
 		}
 		
-		public HtmlViewPane(bool showNavigation) : base ()
+		public HtmlViewPane(bool showNavigation) : base (GType)
 		{
 			//RequestSize = new Size (500, 500);