Author: gert
Date: 2006-11-26 11:55:15 -0500 (Sun, 26 Nov 2006)
New Revision: 68480
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ButtonBase.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Label.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListControl.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PictureBox.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ProgressBar.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/RichTextBox.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ScrollBar.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TrackBar.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/UpDownBase.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/UserControl.cs
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ControlStyleTest.cs
Log:
* ControlStylesTest.cs: Fixed GetStyle for 2.0 profile.
* ProgressBar.cs: GetStyle fixes for 2.0 profile.
* Control.cs: Same.
* UpDownBase.cs: Same.
* ButtonBase.cs: Same.
* ScrollBar.cs: Same.
* TrackBar.cs: Same.
* PictureBox.cs: Same.
* UserControl.cs: Same.
* Label.cs: Same.
* ListControl.cs: Same.
* TextBoxBase.cs: Same.
* ListView.cs: Same.
* RichTextBox.cs: Same.
* TreeView.cs: Same.
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ButtonBase.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ButtonBase.cs
2006-11-26 16:50:52 UTC (rev 68479)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ButtonBase.cs
2006-11-26 16:55:15 UTC (rev 68480)
@@ -155,7 +155,11 @@
ControlStyles.UserMouse |
ControlStyles.SupportsTransparentBackColor |
ControlStyles.CacheText |
+#if NET_2_0
+ ControlStyles.OptimizedDoubleBuffer, true);
+#else
ControlStyles.DoubleBuffer, true);
+#endif
SetStyle(ControlStyles.StandardClick, false);
}
#endregion // Public Constructors
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-11-26 16:50:52 UTC (rev 68479)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-11-26 16:55:15 UTC (rev 68480)
@@ -1,3 +1,20 @@
+2006-11-26 Gert Driesen <[EMAIL PROTECTED]>
+
+ * ProgressBar.cs: GetStyle fixes for 2.0 profile.
+ * Control.cs: Same.
+ * UpDownBase.cs: Same.
+ * ButtonBase.cs: Same.
+ * ScrollBar.cs: Same.
+ * TrackBar.cs: Same.
+ * PictureBox.cs: Same.
+ * UserControl.cs: Same.
+ * Label.cs: Same.
+ * ListControl.cs: Same.
+ * TextBoxBase.cs: Same.
+ * ListView.cs: Same.
+ * RichTextBox.cs: Same.
+ * TreeView.cs: Same.
+
2006-11-25 Jordi Mas i Hernandez <[EMAIL PROTECTED]>
* PrintDialog.cs:
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
2006-11-26 16:50:52 UTC (rev 68479)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
2006-11-26 16:55:15 UTC (rev 68480)
@@ -729,6 +729,9 @@
control_style = ControlStyles.UserPaint |
ControlStyles.AllPaintingInWmPaint |
ControlStyles.Selectable |
ControlStyles.StandardClick |
ControlStyles.StandardDoubleClick;
+#if NET_2_0
+ control_style |= ControlStyles.UseTextForAccessibility;
+#endif
parent = null;
background_image = null;
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Label.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Label.cs
2006-11-26 16:50:52 UTC (rev 68479)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Label.cs
2006-11-26 16:55:15 UTC (rev 68480)
@@ -153,8 +153,13 @@
SetStyle (ControlStyles.ResizeRedraw |
ControlStyles.UserPaint |
ControlStyles.AllPaintingInWmPaint |
- ControlStyles.SupportsTransparentBackColor |
- ControlStyles.DoubleBuffer, true);
+ ControlStyles.SupportsTransparentBackColor
+#if NET_2_0
+ | ControlStyles.OptimizedDoubleBuffer
+#else
+ | ControlStyles.DoubleBuffer
+#endif
+ , true);
HandleCreated += new EventHandler (OnHandleCreatedLB);
}
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListControl.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListControl.cs
2006-11-26 16:50:52 UTC (rev 68479)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListControl.cs
2006-11-26 16:55:15 UTC (rev 68480)
@@ -48,7 +48,11 @@
value_member = new BindingMemberInfo (string.Empty);
display_member = string.Empty;
data_manager = null;
- SetStyle (ControlStyles.StandardClick |
ControlStyles.UserPaint, false);
+ SetStyle (ControlStyles.StandardClick |
ControlStyles.UserPaint
+#if NET_2_0
+ | ControlStyles.UseTextForAccessibility
+#endif
+ , false);
}
#region Events
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs
2006-11-26 16:50:52 UTC (rev 68479)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs
2006-11-26 16:55:15 UTC (rev 68480)
@@ -169,7 +169,11 @@
LostFocus += new EventHandler (FocusChanged);
MouseWheel += new
MouseEventHandler(ListView_MouseWheel);
- this.SetStyle (ControlStyles.UserPaint |
ControlStyles.StandardClick, false);
+ this.SetStyle (ControlStyles.UserPaint |
ControlStyles.StandardClick
+#if NET_2_0
+ | ControlStyles.UseTextForAccessibility
+#endif
+ , false);
}
#endregion // Public Constructors
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PictureBox.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PictureBox.cs
2006-11-26 16:50:52 UTC (rev 68479)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PictureBox.cs
2006-11-26 16:55:15 UTC (rev 68480)
@@ -58,7 +58,11 @@
redraw = true;
recalc = true;
allow_drop = false;
+#if NET_2_0
+ SetStyle (ControlStyles.OptimizedDoubleBuffer, true);
+#else
SetStyle (ControlStyles.DoubleBuffer, true);
+#endif
SetStyle (ControlStyles.Opaque, false);
SetStyle (ControlStyles.Selectable, false);
SetStyle (ControlStyles.SupportsTransparentBackColor,
true);
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ProgressBar.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ProgressBar.cs
2006-11-26 16:50:52 UTC (rev 68479)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ProgressBar.cs
2006-11-26 16:55:15 UTC (rev 68480)
@@ -174,7 +174,11 @@
SetStyle (ControlStyles.UserPaint |
ControlStyles.Selectable |
ControlStyles.ResizeRedraw |
- ControlStyles.Opaque, false);
+ ControlStyles.Opaque
+#if NET_2_0
+ | ControlStyles.UseTextForAccessibility
+#endif
+ , false);
}
#endregion // Public Constructors
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/RichTextBox.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/RichTextBox.cs
2006-11-26 16:50:52 UTC (rev 68479)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/RichTextBox.cs
2006-11-26 16:55:15 UTC (rev 68480)
@@ -83,6 +83,10 @@
ForeColor = ThemeEngine.Current.ColorWindowText;
base.HScrolled += new
EventHandler(RichTextBox_HScrolled);
base.VScrolled += new
EventHandler(RichTextBox_VScrolled);
+
+#if NET_2_0
+ SetStyle (ControlStyles.StandardDoubleClick, false);
+#endif
}
#endregion // Public Constructors
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ScrollBar.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ScrollBar.cs
2006-11-26 16:50:52 UTC (rev 68479)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ScrollBar.cs
2006-11-26 16:55:15 UTC (rev 68480)
@@ -198,7 +198,11 @@
base.TabStop = false;
base.cursor = Cursors.Default;
- SetStyle (ControlStyles.UserPaint |
ControlStyles.StandardClick, false);
+ SetStyle (ControlStyles.UserPaint |
ControlStyles.StandardClick
+#if NET_2_0
+ | ControlStyles.UseTextForAccessibility
+#endif
+ , false);
}
#region Internal & Private Properties
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs
2006-11-26 16:50:52 UTC (rev 68479)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs
2006-11-26 16:55:15 UTC (rev 68480)
@@ -136,8 +136,10 @@
this.Controls.AddImplicit (vscroll);
ResumeLayout ();
- //SetStyle(ControlStyles.ResizeRedraw, true);
SetStyle(ControlStyles.UserPaint |
ControlStyles.StandardClick, false);
+#if NET_2_0
+ SetStyle(ControlStyles.UseTextForAccessibility, false);
+#endif
canvas_width = ClientSize.Width;
canvas_height = ClientSize.Height;
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TrackBar.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TrackBar.cs
2006-11-26 16:50:52 UTC (rev 68479)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TrackBar.cs
2006-11-26 16:55:15 UTC (rev 68480)
@@ -150,7 +150,11 @@
GotFocus += new EventHandler (OnGotFocusTB);
holdclick_timer.Elapsed += new ElapsedEventHandler
(OnFirstClickTimer);
- SetStyle (ControlStyles.UserPaint |
ControlStyles.Opaque, false);
+ SetStyle (ControlStyles.UserPaint | ControlStyles.Opaque
+#if NET_2_0
+ | ControlStyles.UseTextForAccessibility
+#endif
+ , false);
}
#region Private & Internal Properties
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
2006-11-26 16:50:52 UTC (rev 68479)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
2006-11-26 16:55:15 UTC (rev 68480)
@@ -124,7 +124,11 @@
GotFocus += new EventHandler (GotFocusHandler);
MouseWheel += new MouseEventHandler(MouseWheelHandler);
- SetStyle (ControlStyles.UserPaint |
ControlStyles.StandardClick, false);
+ SetStyle (ControlStyles.UserPaint |
ControlStyles.StandardClick
+#if NET_2_0
+ | ControlStyles.UseTextForAccessibility
+#endif
+ , false);
string_format = new StringFormat ();
string_format.LineAlignment = StringAlignment.Center;
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/UpDownBase.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/UpDownBase.cs
2006-11-26 16:50:52 UTC (rev 68479)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/UpDownBase.cs
2006-11-26 16:55:15 UTC (rev 68480)
@@ -309,8 +309,12 @@
// So the child controls don't get auto selected when
the updown is selected
auto_select_child = false;
SetStyle(ControlStyles.FixedHeight, true);
+#if NET_2_0
+ SetStyle (ControlStyles.Opaque |
ControlStyles.ResizeRedraw, true);
+ SetStyle (ControlStyles.StandardClick |
ControlStyles.UseTextForAccessibility, false);
+#endif
- UpdateEditText();
+ UpdateEditText ();
}
#endregion
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/UserControl.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/UserControl.cs
2006-11-26 16:50:52 UTC (rev 68479)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/UserControl.cs
2006-11-26 16:55:15 UTC (rev 68480)
@@ -40,6 +40,9 @@
public class UserControl : ContainerControl {
#region Public Constructors
public UserControl() {
+#if NET_2_0
+ SetStyle (ControlStyles.SupportsTransparentBackColor,
true);
+#endif
}
#endregion // Public Constructors
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
2006-11-26 16:50:52 UTC (rev 68479)
+++ trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
2006-11-26 16:55:15 UTC (rev 68480)
@@ -1,5 +1,9 @@
2006-11-26 Gert Driesen <[EMAIL PROTECTED]>
+ * ControlStylesTest.cs: Fixed GetStyle for 2.0 profile.
+
+2006-11-26 Gert Driesen <[EMAIL PROTECTED]>
+
* FormTest.cs: Added test for bug #80052.
2006-11-25 Gert Driesen <[EMAIL PROTECTED]>
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ControlStyleTest.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ControlStyleTest.cs
2006-11-26 16:50:52 UTC (rev 68479)
+++
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ControlStyleTest.cs
2006-11-26 16:55:15 UTC (rev 68480)
@@ -60,7 +60,11 @@
"AllPaintingInWmPaint=True",
"CacheText=False",
"EnableNotifyMessage=False",
- "DoubleBuffer=False"
+ "DoubleBuffer=False",
+#if NET_2_0
+ "OptimizedDoubleBuffer=False",
+ "UseTextForAccessibility=True"
+#endif
};
Assert.AreEqual(Control_want, GetStyles(new Control()),
"ControlStyles");
@@ -85,13 +89,18 @@
"AllPaintingInWmPaint=True",
"CacheText=True",
"EnableNotifyMessage=False",
+#if NET_2_0
+ "DoubleBuffer=False",
+ "OptimizedDoubleBuffer=True",
+ "UseTextForAccessibility=True"
+#else
"DoubleBuffer=True"
+#endif
};
Assert.AreEqual(Button_want, GetStyles(new Button()),
"ButtonStyles");
}
-
[Test]
public void CheckBoxStyleTest ()
{
@@ -110,13 +119,18 @@
"AllPaintingInWmPaint=True",
"CacheText=True",
"EnableNotifyMessage=False",
+#if NET_2_0
+ "DoubleBuffer=False",
+ "OptimizedDoubleBuffer=True",
+ "UseTextForAccessibility=True"
+#else
"DoubleBuffer=True"
+#endif
};
Assert.AreEqual(CheckBox_want, GetStyles(new
CheckBox()), "CheckBoxStyles");
}
-
[Test]
public void RadioButtonStyleTest ()
{
@@ -135,13 +149,18 @@
"AllPaintingInWmPaint=True",
"CacheText=True",
"EnableNotifyMessage=False",
+#if NET_2_0
+ "DoubleBuffer=False",
+ "OptimizedDoubleBuffer=True",
+ "UseTextForAccessibility=True"
+#else
"DoubleBuffer=True"
+#endif
};
Assert.AreEqual(RadioButton_want, GetStyles(new
RadioButton()), "RadioButtonStyles");
}
-
[Test]
public void DataGridStyleTest ()
{
@@ -160,13 +179,16 @@
"AllPaintingInWmPaint=True",
"CacheText=False",
"EnableNotifyMessage=False",
- "DoubleBuffer=False"
+ "DoubleBuffer=False",
+#if NET_2_0
+ "OptimizedDoubleBuffer=False",
+ "UseTextForAccessibility=True"
+#endif
};
Assert.AreEqual(DataGrid_want, GetStyles(new
DataGrid()), "DataGridStyles");
}
-
[Test]
public void DateTimePickerStyleTest ()
{
@@ -185,13 +207,16 @@
"AllPaintingInWmPaint=True",
"CacheText=False",
"EnableNotifyMessage=False",
- "DoubleBuffer=False"
+ "DoubleBuffer=False",
+#if NET_2_0
+ "OptimizedDoubleBuffer=False",
+ "UseTextForAccessibility=True"
+#endif
};
Assert.AreEqual(DateTimePicker_want, GetStyles(new
DateTimePicker()), "DateTimePickerStyles");
}
-
[Test]
public void GroupBoxStyleTest ()
{
@@ -210,13 +235,16 @@
"AllPaintingInWmPaint=True",
"CacheText=False",
"EnableNotifyMessage=False",
- "DoubleBuffer=False"
+ "DoubleBuffer=False",
+#if NET_2_0
+ "OptimizedDoubleBuffer=False",
+ "UseTextForAccessibility=True"
+#endif
};
Assert.AreEqual(GroupBox_want, GetStyles(new
GroupBox()), "GroupBoxStyles");
}
-
[Test]
public void LabelStyleTest ()
{
@@ -235,13 +263,18 @@
"AllPaintingInWmPaint=True",
"CacheText=False",
"EnableNotifyMessage=False",
+#if NET_2_0
+ "DoubleBuffer=False",
+ "OptimizedDoubleBuffer=True",
+ "UseTextForAccessibility=True"
+#else
"DoubleBuffer=True"
+#endif
};
Assert.AreEqual(Label_want, GetStyles(new Label()),
"LabelStyles");
}
-
[Test]
public void LinkLabelStyleTest ()
{
@@ -260,7 +293,13 @@
"AllPaintingInWmPaint=True",
"CacheText=False",
"EnableNotifyMessage=False",
+#if NET_2_0
+ "DoubleBuffer=False",
+ "OptimizedDoubleBuffer=True",
+ "UseTextForAccessibility=True"
+#else
"DoubleBuffer=True"
+#endif
};
string[] LinkLabel_link_want = {
@@ -278,10 +317,15 @@
"AllPaintingInWmPaint=True",
"CacheText=False",
"EnableNotifyMessage=False",
+#if NET_2_0
+ "DoubleBuffer=False",
+ "OptimizedDoubleBuffer=True",
+ "UseTextForAccessibility=True"
+#else
"DoubleBuffer=True"
+#endif
};
-
Assert.AreEqual(LinkLabel_want, GetStyles(new
LinkLabel()), "LinkLabelStyles");
// Test LinkLabel with a link
@@ -292,7 +336,6 @@
}
-
[Test]
public void ComboBoxStyleTest ()
{
@@ -311,13 +354,16 @@
"AllPaintingInWmPaint=True",
"CacheText=False",
"EnableNotifyMessage=False",
- "DoubleBuffer=False"
+ "DoubleBuffer=False",
+#if NET_2_0
+ "OptimizedDoubleBuffer=False",
+ "UseTextForAccessibility=False"
+#endif
};
Assert.AreEqual(ComboBox_want, GetStyles(new
ComboBox()), "ComboBoxStyles");
}
-
[Test]
public void ListBoxStyleTest ()
{
@@ -336,13 +382,16 @@
"AllPaintingInWmPaint=True",
"CacheText=False",
"EnableNotifyMessage=False",
- "DoubleBuffer=False"
+ "DoubleBuffer=False",
+#if NET_2_0
+ "OptimizedDoubleBuffer=False",
+ "UseTextForAccessibility=False"
+#endif
};
Assert.AreEqual(ListBox_want, GetStyles(new ListBox()),
"ListBoxStyles");
}
-
[Test]
public void CheckedListBoxStyleTest ()
{
@@ -361,13 +410,16 @@
"AllPaintingInWmPaint=True",
"CacheText=False",
"EnableNotifyMessage=False",
- "DoubleBuffer=False"
+ "DoubleBuffer=False",
+#if NET_2_0
+ "OptimizedDoubleBuffer=False",
+ "UseTextForAccessibility=False"
+#endif
};
Assert.AreEqual(CheckedListBox_want, GetStyles(new
CheckedListBox()), "CheckedListBoxStyles");
}
-
[Test]
public void ListViewStyleTest ()
{
@@ -386,13 +438,16 @@
"AllPaintingInWmPaint=True",
"CacheText=False",
"EnableNotifyMessage=False",
- "DoubleBuffer=False"
+ "DoubleBuffer=False",
+#if NET_2_0
+ "OptimizedDoubleBuffer=False",
+ "UseTextForAccessibility=False"
+#endif
};
Assert.AreEqual(ListView_want, GetStyles(new
ListView()), "ListViewStyles");
}
-
[Test]
public void MdiClientStyleTest ()
{
@@ -411,13 +466,16 @@
"AllPaintingInWmPaint=True",
"CacheText=False",
"EnableNotifyMessage=False",
- "DoubleBuffer=False"
+ "DoubleBuffer=False",
+#if NET_2_0
+ "OptimizedDoubleBuffer=False",
+ "UseTextForAccessibility=True"
+#endif
};
Assert.AreEqual(MdiClient_want, GetStyles(new
MdiClient()), "MdiClientStyles");
}
-
[Test]
public void MonthCalendarStyleTest ()
{
@@ -436,13 +494,16 @@
"AllPaintingInWmPaint=True",
"CacheText=False",
"EnableNotifyMessage=False",
- "DoubleBuffer=False"
+ "DoubleBuffer=False",
+#if NET_2_0
+ "OptimizedDoubleBuffer=False",
+ "UseTextForAccessibility=True"
+#endif
};
Assert.AreEqual(MonthCalendar_want, GetStyles(new
MonthCalendar()), "MonthCalendarStyles");
}
-
[Test]
public void PictureBoxStyleTest ()
{
@@ -461,13 +522,18 @@
"AllPaintingInWmPaint=True",
"CacheText=False",
"EnableNotifyMessage=False",
+#if NET_2_0
+ "DoubleBuffer=False",
+ "OptimizedDoubleBuffer=True",
+ "UseTextForAccessibility=True"
+#else
"DoubleBuffer=True"
+#endif
};
Assert.AreEqual(PictureBox_want, GetStyles(new
PictureBox()), "PictureBoxStyles");
}
-
[Test]
public void ProgressBarStyleTest ()
{
@@ -486,13 +552,16 @@
"AllPaintingInWmPaint=True",
"CacheText=False",
"EnableNotifyMessage=False",
- "DoubleBuffer=False"
+ "DoubleBuffer=False",
+#if NET_2_0
+ "OptimizedDoubleBuffer=False",
+ "UseTextForAccessibility=False"
+#endif
};
Assert.AreEqual(ProgressBar_want, GetStyles(new
ProgressBar()), "ProgressBarStyles");
}
-
[Test]
public void ScrollableControlStyleTest ()
{
@@ -511,13 +580,16 @@
"AllPaintingInWmPaint=False",
"CacheText=False",
"EnableNotifyMessage=False",
- "DoubleBuffer=False"
+ "DoubleBuffer=False",
+#if NET_2_0
+ "OptimizedDoubleBuffer=False",
+ "UseTextForAccessibility=True"
+#endif
};
Assert.AreEqual(ScrollableControl_want, GetStyles(new
ScrollableControl()), "ScrollableControlStyles");
}
-
[Test]
public void ContainerControlStyleTest ()
{
@@ -536,13 +608,16 @@
"AllPaintingInWmPaint=False",
"CacheText=False",
"EnableNotifyMessage=False",
- "DoubleBuffer=False"
+ "DoubleBuffer=False",
+#if NET_2_0
+ "OptimizedDoubleBuffer=False",
+ "UseTextForAccessibility=True"
+#endif
};
Assert.AreEqual(ContainerControl_want, GetStyles(new
ContainerControl()), "ContainerControlStyles");
}
-
[Test]
public void FormStyleTest ()
{
@@ -561,7 +636,11 @@
"AllPaintingInWmPaint=False",
"CacheText=False",
"EnableNotifyMessage=False",
- "DoubleBuffer=False"
+ "DoubleBuffer=False",
+#if NET_2_0
+ "OptimizedDoubleBuffer=False",
+ "UseTextForAccessibility=True"
+#endif
};
Form f = new Form ();
@@ -570,7 +649,6 @@
f.Dispose ();
}
-
[Test]
public void PropertyGridStyleTest ()
{
@@ -589,24 +667,36 @@
"AllPaintingInWmPaint=False",
"CacheText=False",
"EnableNotifyMessage=False",
- "DoubleBuffer=False"
+ "DoubleBuffer=False",
+#if NET_2_0
+ "OptimizedDoubleBuffer=False",
+ "UseTextForAccessibility=True"
+#endif
};
Assert.AreEqual(PropertyGrid_want, GetStyles(new
PropertyGrid()), "PropertyGridStyles");
}
-
[Test]
public void DomainUpDownStyleTest ()
{
string[] DomainUpDown_want = {
"ContainerControl=True",
"UserPaint=True",
+#if NET_2_0
+ "Opaque=True",
+ "ResizeRedraw=True",
+#else
"Opaque=False",
"ResizeRedraw=False",
+#endif
"FixedWidth=False",
"FixedHeight=True",
+#if NET_2_0
+ "StandardClick=False",
+#else
"StandardClick=True",
+#endif
"Selectable=True",
"UserMouse=False",
"SupportsTransparentBackColor=False",
@@ -614,24 +704,36 @@
"AllPaintingInWmPaint=False",
"CacheText=False",
"EnableNotifyMessage=False",
- "DoubleBuffer=False"
+ "DoubleBuffer=False",
+#if NET_2_0
+ "OptimizedDoubleBuffer=False",
+ "UseTextForAccessibility=False"
+#endif
};
Assert.AreEqual(DomainUpDown_want, GetStyles(new
DomainUpDown()), "DomainUpDownStyles");
}
-
[Test]
public void NumericUpDownStyleTest ()
{
string[] NumericUpDown_want = {
"ContainerControl=True",
"UserPaint=True",
+#if NET_2_0
+ "Opaque=True",
+ "ResizeRedraw=True",
+#else
"Opaque=False",
"ResizeRedraw=False",
+#endif
"FixedWidth=False",
"FixedHeight=True",
+#if NET_2_0
+ "StandardClick=False",
+#else
"StandardClick=True",
+#endif
"Selectable=True",
"UserMouse=False",
"SupportsTransparentBackColor=False",
@@ -639,13 +741,16 @@
"AllPaintingInWmPaint=False",
"CacheText=False",
"EnableNotifyMessage=False",
- "DoubleBuffer=False"
+ "DoubleBuffer=False",
+#if NET_2_0
+ "OptimizedDoubleBuffer=False",
+ "UseTextForAccessibility=False"
+#endif
};
Assert.AreEqual(NumericUpDown_want, GetStyles(new
NumericUpDown()), "NumericUpDownStyles");
}
-
[Test]
public void UserControlStyleTest ()
{
@@ -659,18 +764,25 @@
"StandardClick=True",
"Selectable=True",
"UserMouse=False",
+#if NET_2_0
+ "SupportsTransparentBackColor=True",
+#else
"SupportsTransparentBackColor=False",
+#endif
"StandardDoubleClick=True",
"AllPaintingInWmPaint=False",
"CacheText=False",
"EnableNotifyMessage=False",
- "DoubleBuffer=False"
+ "DoubleBuffer=False",
+#if NET_2_0
+ "OptimizedDoubleBuffer=False",
+ "UseTextForAccessibility=True"
+#endif
};
Assert.AreEqual(UserControl_want, GetStyles(new
UserControl()), "UserControlStyles");
}
-
[Test]
public void PanelStyleTest ()
{
@@ -689,13 +801,16 @@
"AllPaintingInWmPaint=False",
"CacheText=False",
"EnableNotifyMessage=False",
- "DoubleBuffer=False"
+ "DoubleBuffer=False",
+#if NET_2_0
+ "OptimizedDoubleBuffer=False",
+ "UseTextForAccessibility=True"
+#endif
};
Assert.AreEqual(Panel_want, GetStyles(new Panel()),
"PanelStyles");
}
-
[Test]
public void TabPageStyleTest ()
{
@@ -714,13 +829,16 @@
"AllPaintingInWmPaint=False",
"CacheText=True",
"EnableNotifyMessage=False",
- "DoubleBuffer=False"
+ "DoubleBuffer=False",
+#if NET_2_0
+ "OptimizedDoubleBuffer=False",
+ "UseTextForAccessibility=True"
+#endif
};
Assert.AreEqual(TabPage_want, GetStyles(new TabPage()),
"TabPageStyles");
}
-
[Test]
public void HScrollBarStyleTest ()
{
@@ -739,13 +857,16 @@
"AllPaintingInWmPaint=True",
"CacheText=False",
"EnableNotifyMessage=False",
- "DoubleBuffer=False"
+ "DoubleBuffer=False",
+#if NET_2_0
+ "OptimizedDoubleBuffer=False",
+ "UseTextForAccessibility=False"
+#endif
};
Assert.AreEqual(HScrollBar_want, GetStyles(new
HScrollBar()), "HScrollBarStyles");
}
-
[Test]
public void VScrollBarStyleTest ()
{
@@ -764,13 +885,16 @@
"AllPaintingInWmPaint=True",
"CacheText=False",
"EnableNotifyMessage=False",
- "DoubleBuffer=False"
+ "DoubleBuffer=False",
+#if NET_2_0
+ "OptimizedDoubleBuffer=False",
+ "UseTextForAccessibility=False"
+#endif
};
Assert.AreEqual(VScrollBar_want, GetStyles(new
VScrollBar()), "VScrollBarStyles");
}
-
[Test]
public void SplitterStyleTest ()
{
@@ -789,13 +913,16 @@
"AllPaintingInWmPaint=True",
"CacheText=False",
"EnableNotifyMessage=False",
- "DoubleBuffer=False"
+ "DoubleBuffer=False",
+#if NET_2_0
+ "OptimizedDoubleBuffer=False",
+ "UseTextForAccessibility=True"
+#endif
};
Assert.AreEqual(Splitter_want, GetStyles(new
Splitter()), "SplitterStyles");
}
-
[Test]
public void StatusBarStyleTest ()
{
@@ -814,13 +941,16 @@
"AllPaintingInWmPaint=True",
"CacheText=False",
"EnableNotifyMessage=False",
- "DoubleBuffer=False"
+ "DoubleBuffer=False",
+#if NET_2_0
+ "OptimizedDoubleBuffer=False",
+ "UseTextForAccessibility=True"
+#endif
};
Assert.AreEqual(StatusBar_want, GetStyles(new
StatusBar()), "StatusBarStyles");
}
-
[Test]
public void TabControlStyleTest ()
{
@@ -839,13 +969,16 @@
"AllPaintingInWmPaint=True",
"CacheText=False",
"EnableNotifyMessage=False",
- "DoubleBuffer=False"
+ "DoubleBuffer=False",
+#if NET_2_0
+ "OptimizedDoubleBuffer=False",
+ "UseTextForAccessibility=True"
+#endif
};
Assert.AreEqual(TabControl_want, GetStyles(new
TabControl()), "TabControlStyles");
}
-
[Test]
public void RichTextBoxStyleTest ()
{
@@ -860,17 +993,24 @@
"Selectable=True",
"UserMouse=False",
"SupportsTransparentBackColor=False",
+#if NET_2_0
+ "StandardDoubleClick=False",
+#else
"StandardDoubleClick=True",
+#endif
"AllPaintingInWmPaint=True",
"CacheText=False",
"EnableNotifyMessage=False",
- "DoubleBuffer=False"
+ "DoubleBuffer=False",
+#if NET_2_0
+ "OptimizedDoubleBuffer=False",
+ "UseTextForAccessibility=False"
+#endif
};
Assert.AreEqual(RichTextBox_want, GetStyles(new
RichTextBox()), "RichTextBoxStyles");
}
-
[Test]
public void TextBoxStyleTest ()
{
@@ -889,13 +1029,16 @@
"AllPaintingInWmPaint=True",
"CacheText=False",
"EnableNotifyMessage=False",
- "DoubleBuffer=False"
+ "DoubleBuffer=False",
+#if NET_2_0
+ "OptimizedDoubleBuffer=False",
+ "UseTextForAccessibility=False"
+#endif
};
Assert.AreEqual(TextBox_want, GetStyles(new TextBox()),
"TextBoxStyles");
}
-
[Test]
public void DataGridTextBoxStyleTest ()
{
@@ -914,13 +1057,16 @@
"AllPaintingInWmPaint=True",
"CacheText=False",
"EnableNotifyMessage=False",
- "DoubleBuffer=False"
+ "DoubleBuffer=False",
+#if NET_2_0
+ "OptimizedDoubleBuffer=False",
+ "UseTextForAccessibility=False"
+#endif
};
Assert.AreEqual(DataGridTextBox_want, GetStyles(new
DataGridTextBox()), "DataGridTextBoxStyles");
}
-
[Test]
public void ToolBarStyleTest ()
{
@@ -939,13 +1085,16 @@
"AllPaintingInWmPaint=True",
"CacheText=False",
"EnableNotifyMessage=False",
- "DoubleBuffer=False"
+ "DoubleBuffer=False",
+#if NET_2_0
+ "OptimizedDoubleBuffer=False",
+ "UseTextForAccessibility=True"
+#endif
};
Assert.AreEqual(ToolBar_want, GetStyles(new ToolBar()),
"ToolBarStyles");
}
-
[Test]
public void TrackBarStyleTest ()
{
@@ -964,13 +1113,16 @@
"AllPaintingInWmPaint=True",
"CacheText=False",
"EnableNotifyMessage=False",
- "DoubleBuffer=False"
+ "DoubleBuffer=False",
+#if NET_2_0
+ "OptimizedDoubleBuffer=False",
+ "UseTextForAccessibility=False"
+#endif
};
Assert.AreEqual(TrackBar_want, GetStyles(new
TrackBar()), "TrackBarStyles");
}
-
[Test]
public void TreeViewStyleTest ()
{
@@ -989,13 +1141,14 @@
"AllPaintingInWmPaint=True",
"CacheText=False",
"EnableNotifyMessage=False",
- "DoubleBuffer=False"
+ "DoubleBuffer=False",
+#if NET_2_0
+ "OptimizedDoubleBuffer=False",
+ "UseTextForAccessibility=False"
+#endif
};
Assert.AreEqual(TreeView_want, GetStyles(new
TreeView()), "TreeViewStyles");
}
-
-
}
}
-
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
