Author: toshok
Date: 2007-01-10 19:12:23 -0500 (Wed, 10 Jan 2007)
New Revision: 70824
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Splitter.cs
Log:
* Splitter.cs: clearing some outstanding changes from my tree.
Replace all accesses (not writes) to the internal dock_style field
with the Dock property.
2007-01-10 Chris Toshok <[EMAIL PROTECTED]>
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-01-11 00:10:49 UTC (rev 70823)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-01-11 00:12:23 UTC (rev 70824)
@@ -1,5 +1,11 @@
2007-01-10 Chris Toshok <[EMAIL PROTECTED]>
+ * Splitter.cs: clearing some outstanding changes from my tree.
+ Replace all accesses (not writes) to the internal dock_style field
+ with the Dock property.
+
+2007-01-10 Chris Toshok <[EMAIL PROTECTED]>
+
* Control.cs: make FireEnter, FireLeave, FireValidating, and
FireValidated virtual.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Splitter.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Splitter.cs
2007-01-11 00:10:49 UTC (rev 70823)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Splitter.cs
2007-01-11 00:12:23 UTC (rev 70824)
@@ -387,7 +387,7 @@
// Calculate limits
if (filler != null) {
if (horizontal) {
- if (dock_style == DockStyle.Top) {
+ if (Dock == DockStyle.Top) {
limit_min = affected.Bounds.Top
+ min_size;
limit_max =
filler.Bounds.Bottom - min_extra + this.bounds.Top - filler.Bounds.Top;
} else {
@@ -395,7 +395,7 @@
limit_max =
affected.Bounds.Bottom - min_size - this.Height;
}
} else {
- if (dock_style == DockStyle.Left) {
+ if (Dock == DockStyle.Left) {
limit_min =
affected.Bounds.Left + min_size;
limit_max = filler.Bounds.Right
- min_extra + this.bounds.Left - filler.Bounds.Left;
} else {
@@ -420,14 +420,14 @@
if (horizontal) {
split_position = pt.Y;
- if (dock_style == DockStyle.Top) {
+ if (Dock == DockStyle.Top) {
click_offset = e.Y;
} else {
click_offset = -e.Y;
}
} else {
split_position = pt.X;
- if (dock_style == DockStyle.Left) {
+ if (Dock == DockStyle.Left) {
click_offset = e.X;
} else {
click_offset = -e.X;
@@ -582,7 +582,7 @@
// Doc says the first control preceeding us in
the zorder
for (int i =
Parent.Controls.GetChildIndex(this) + 1; i < Parent.Controls.Count; i++) {
- switch(this.Dock) {
+ switch (Dock) {
case DockStyle.Top: {
if (Top ==
Parent.Controls[i].Bottom) {
return
Parent.Controls[i];
@@ -634,13 +634,13 @@
private int CalculateSplitPosition() {
if (horizontal) {
- if (dock_style == DockStyle.Top) {
+ if (Dock == DockStyle.Top) {
return split_position - affected.Top;
} else {
return affected.Bottom - split_position
- splitter_size;
}
} else {
- if (dock_style == DockStyle.Left) {
+ if (Dock == DockStyle.Left) {
return split_position - affected.Left;
} else {
return affected.Right - split_position
- splitter_size;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
