Fixed merge issue

Clancey · Feb 23, 2011 · f841c6e · f841c6e
1 parent 2d299b4
commit f841c6e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/ComboBox.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/ComboBox.cocoa.cs
@@ -16,10 +16,6 @@ namespace System.Windows.Forms
 	public partial class ComboBox : ListControl
 	{
 		internal ComboBoxHelper m_helper;
-		internal override NSView c_helper {
-			get { return m_helper; }
-			set { m_helper = value as ComboBoxHelper; }
-		}
 
 		internal override void DrawItemInternal (DrawItemEventArgs e)
 		{

diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/Label.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/Label.cocoa.cs
@@ -32,7 +32,7 @@ private void resize ()
 
 		protected override void CreateHandle ()
 		{
-      m_helper = new TextBoxMouseView();
+      		m_helper = new TextBoxMouseView();
 			m_view = m_helper;
 			m_helper.Host = this;
 			m_helper.Editable = false;