Преглед изворни кода

Small fixes

svn path=/trunk/mcs/; revision=69783
Miguel de Icaza пре 19 година
родитељ
комит
42ca079918

+ 10 - 0
mcs/class/Managed.Windows.Forms/SWF.csproj

@@ -2218,6 +2218,11 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "System.Windows.Forms\ListViewHitTestInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "System.Windows.Forms\ListViewHitTestLocations.cs"
                     SubType = "Code"
@@ -3113,6 +3118,11 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "System.Windows.Forms\TableLayoutStyle.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "System.Windows.Forms\TextBox.cs"
                     SubType = "Code"

+ 2 - 0
mcs/class/Managed.Windows.Forms/SWF2k5.csproj

@@ -558,6 +558,7 @@
     <Compile Include="System.Windows.Forms\ListViewAlignment.cs" />
     <Compile Include="System.Windows.Forms\ListViewGroup.cs" />
     <Compile Include="System.Windows.Forms\ListViewGroupCollection.cs" />
+    <Compile Include="System.Windows.Forms\ListViewHitTestInfo.cs" />
     <Compile Include="System.Windows.Forms\ListViewHitTestLocations.cs" />
     <Compile Include="System.Windows.Forms\ListViewItem.cs" />
     <Compile Include="System.Windows.Forms\ListViewItemConverter.cs" />
@@ -737,6 +738,7 @@
     <Compile Include="System.Windows.Forms\TableLayoutPanelCellBorderStyle.cs" />
     <Compile Include="System.Windows.Forms\TableLayoutPanelGrowStyle.cs" />
     <Compile Include="System.Windows.Forms\TableLayoutSettings.cs" />
+    <Compile Include="System.Windows.Forms\TableLayoutStyle.cs" />
     <Compile Include="System.Windows.Forms\TextBox.cs" />
     <Compile Include="System.Windows.Forms\TextBoxBase.cs" />
     <Compile Include="System.Windows.Forms\TextBoxRenderer.cs" />

+ 2 - 0
mcs/class/Managed.Windows.Forms/System.Windows.Forms.dll.sources

@@ -588,12 +588,14 @@ System.Windows.Forms/TabDrawMode.cs
 System.Windows.Forms/TabPage.cs
 System.Windows.Forms/TabRenderer.cs
 System.Windows.Forms/TabSizeMode.cs
+System.Windows.Forms/TableLayout.cs
 System.Windows.Forms/TableLayoutCellPaintEventArgs.cs
 System.Windows.Forms/TableLayoutCellPaintEventHandler.cs
 System.Windows.Forms/TableLayoutPanel.cs
 System.Windows.Forms/TableLayoutPanelCellBorderStyle.cs
 System.Windows.Forms/TableLayoutPanelGrowStyle.cs
 System.Windows.Forms/TableLayoutSettings.cs
+System.Windows.Forms/TableLayoutStyle.cs
 System.Windows.Forms/TextBox.cs
 System.Windows.Forms/TextBoxBase.cs
 System.Windows.Forms/TextBoxRenderer.cs

+ 1 - 1
mcs/class/Managed.Windows.Forms/System.Windows.Forms/TableLayout.cs

@@ -30,7 +30,7 @@ using System.Windows.Forms.Layout;
 
 namespace System.Windows.Forms {
 
-	public class TableLayout : LayoutEngine {
+	internal class TableLayout : LayoutEngine {
 
 		public override void InitLayout (object child, BoundsSpecified specified)
 		{

+ 14 - 1
mcs/class/Managed.Windows.Forms/System.Windows.Forms/TableLayoutPanel.cs

@@ -21,16 +21,19 @@
 // Author:
 //   Miguel de Icaza ([email protected])
 //
-// (C) 2004 Novell, Inc.
+// (C) 2004, 2006 Novell, Inc.
 //
 #if NET_2_0
 using System;
 using System.ComponentModel;
+using System.Runtime.InteropServices;
 
 namespace System.Windows.Forms {
 
+	[ComVisible(true)]
 	public class TableLayoutPanel : Panel, IExtenderProvider {
 		TableLayoutSettings settings;
+		TableLayoutPanelCellBorderStyle cell_border_style;
 		
 		public TableLayoutPanel ()
 		{
@@ -52,6 +55,16 @@ namespace System.Windows.Forms {
 			}
 		}
 
+		public TableLayoutPanelCellBorderStyle CellBorderStyle {
+			get {
+				return cell_border_style;
+			}
+
+			set {
+				cell_border_style = value;
+			}
+		}
+		
 		public int ColumnCount {
 			get {
 				return settings.ColumnCount;

+ 3 - 4
mcs/class/Managed.Windows.Forms/System.Windows.Forms/TableLayoutSettings.cs

@@ -37,12 +37,10 @@ namespace System.Windows.Forms {
 		//TableLayoutPanel panel;
 		ColumnStyleCollection column_style;
 		TableLayoutPanelGrowStyle grow_style;
+		LayoutEngine layout_engine;
 		int column_count;
 		int row_count;
 
-		// Statics
-		static LayoutEngine layout_engine = new TableLayout ();
-		
 		internal TableLayoutSettings (TableLayoutPanel panel)
 		{
 			//this.panel = panel;
@@ -50,6 +48,7 @@ namespace System.Windows.Forms {
 			row_count = 0;
 			grow_style = TableLayoutPanelGrowStyle.AddRows;
 			column_style = new ColumnStyleCollection (panel);
+			layout_engine = new TableLayout ();
 		}
 
 		public int ColumnCount {
@@ -84,7 +83,7 @@ namespace System.Windows.Forms {
 			}
 		}
 				
-		public TableLayoutSettings.ColumnStyleCollection ColumnStyle {
+		public TableLayoutSettings.ColumnStyleCollection ColumnStyles {
 			get {
 				return column_style;
 			}