Author: everaldo
Date: 2008-01-23 13:08:46 -0500 (Wed, 23 Jan 2008)
New Revision: 93683
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Binding.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/DataGridView.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Hwnd.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGridView.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextControl.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolTip.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
Log:
2008-01-23 Everaldo Canuto <[EMAIL PROTECTED]>
* Form.cs: Remove unused declaration of 'active' in Activate method.
* Control.cs: Move declaration of nested_layout inside '#if NET_2_0" to
prevent compilation warnings.
* TextControl.cs: Remove unused declaration of selection_pos_on_line.
* Hwnd.cs: Remove unused declaration of clip in GetClippingRectangles.
* Bindings.cs: Remove unused formatting_enabled declaration.
* ToolTip.cs: Put some methods inside '#if NET_2_0" to prevent
compilation
warnings.
* TreeView.cs: Put some methods inside '#if NET_2_0" to prevent
compilation
warnings.
* PropertyGridView.cs: Remove usused 'ex' declaration.
* DataGridView.cs: Remove unused declarations.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Binding.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Binding.cs
2008-01-23 18:06:50 UTC (rev 93682)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Binding.cs
2008-01-23 18:08:46 UTC (rev 93683)
@@ -50,7 +50,6 @@
private Type data_type;
#if NET_2_0
- private bool formatting_enabled;
private DataSourceUpdateMode datasource_update_mode;
private object null_value;
private string format_string;
@@ -89,7 +88,6 @@
data_source = dataSource;
data_member = dataMember;
binding_member_info = new BindingMemberInfo
(dataMember);
- formatting_enabled = formattingEnabled;
datasource_update_mode = dataSourceUpdateMode;
null_value = nullValue;
format_string = formatString;
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2008-01-23 18:06:50 UTC (rev 93682)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2008-01-23 18:08:46 UTC (rev 93683)
@@ -1,5 +1,20 @@
2008-01-23 Everaldo Canuto <[EMAIL PROTECTED]>
+ * Form.cs: Remove unused declaration of 'active' in Activate method.
+ * Control.cs: Move declaration of nested_layout inside '#if NET_2_0" to
+ prevent compilation warnings.
+ * TextControl.cs: Remove unused declaration of selection_pos_on_line.
+ * Hwnd.cs: Remove unused declaration of clip in GetClippingRectangles.
+ * Bindings.cs: Remove unused formatting_enabled declaration.
+ * ToolTip.cs: Put some methods inside '#if NET_2_0" to prevent
compilation
+ warnings.
+ * TreeView.cs: Put some methods inside '#if NET_2_0" to prevent
compilation
+ warnings.
+ * PropertyGridView.cs: Remove usused 'ex' declaration.
+ * DataGridView.cs: Remove unused declarations.
+
+2008-01-23 Everaldo Canuto <[EMAIL PROTECTED]>
+
[Fixes bugs #343966, #338511 and other non reported (context)menu bugs]
* Form.cs: Remove all active_tracker (used by menu) stuff, it is now
moved
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
2008-01-23 18:06:50 UTC (rev 93682)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
2008-01-23 18:08:46 UTC (rev 93683)
@@ -119,7 +119,6 @@
internal DockStyle dock_style; // docking requirements for our
control
LayoutType layout_type;
private bool recalculate_distances = true; // Delay anchor
calculations
- private bool nested_layout = false;
// Please leave the next 2 as internal until DefaultLayout
(2.0) is rewritten
internal int dist_right; // distance to the
right border of the parent
@@ -148,6 +147,7 @@
Size minimum_size;
Padding margin;
private ContextMenuStrip context_menu_strip;
+ private bool nested_layout = false;
Point auto_scroll_offset;
private AutoSizeMode auto_size_mode;
private bool suppressing_key_press;
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridView.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridView.cs
2008-01-23 18:06:50 UTC (rev 93682)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridView.cs
2008-01-23 18:08:46 UTC (rev 93683)
@@ -3441,8 +3441,8 @@
Keys modifiers = Control.ModifierKeys;
bool isControl = (modifiers & Keys.Control) != 0;
bool isShift = (modifiers & Keys.Shift) != 0;
- bool isRowHeader = hitTest.Type ==
DataGridViewHitTestType.RowHeader;
- bool isColHeader = hitTest.Type ==
DataGridViewHitTestType.ColumnHeader;
+ //bool isRowHeader = hitTest.Type ==
DataGridViewHitTestType.RowHeader;
+ //bool isColHeader = hitTest.Type ==
DataGridViewHitTestType.ColumnHeader;
DataGridViewSelectionMode mode;
switch (hitTest.Type) {
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
2008-01-23 18:06:50 UTC (rev 93682)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
2008-01-23 18:08:46 UTC (rev 93683)
@@ -1619,8 +1619,6 @@
public void Activate ()
{
- Form active;
-
if (IsHandleCreated) {
if (IsMdiChild) {
MdiParent.ActivateMdiChild (this);
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Hwnd.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Hwnd.cs
2008-01-23 18:06:50 UTC (rev 93682)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Hwnd.cs
2008-01-23 18:08:46 UTC (rev 93683)
@@ -294,7 +294,6 @@
ArrayList siblings = parent.children;
foreach (Hwnd sibling in siblings) {
- bool clip = false;
IntPtr sibling_handle = whole_window;
if (sibling == this)
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGridView.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGridView.cs
2008-01-23 18:06:50 UTC (rev 93682)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGridView.cs
2008-01-23 18:08:46 UTC (rev 93683)
@@ -771,7 +771,7 @@
//Console.WriteLine("No
converter for type {0}",desc.PropertyType);
}
}
- catch (Exception ex) {
+ catch /*(Exception ex)*/ {
//Console.WriteLine("Error
converting string: " + ex.Message);
}
}
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextControl.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextControl.cs
2008-01-23 18:06:50 UTC (rev 93682)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextControl.cs
2008-01-23 18:08:46 UTC (rev 93683)
@@ -3063,7 +3063,6 @@
internal void ReplaceSelection(string s, bool select_new) {
int i;
- int selection_pos_on_line = selection_start.pos;
int selection_start_pos = LineTagToCharIndex
(selection_start.line, selection_start.pos);
SuspendRecalc ();
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolTip.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolTip.cs
2008-01-23 18:06:50 UTC (rev 93682)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolTip.cs
2008-01-23 18:08:46 UTC (rev 93683)
@@ -674,6 +674,7 @@
#region Private Methods
+#if NET_2_0
private void HookupFormEvents (Form form)
{
hooked_form = form;
@@ -683,18 +684,6 @@
form.Resize += new EventHandler (Form_Resize);
}
- private void UnhookFormEvents ()
- {
- if (hooked_form == null)
- return;
-
- hooked_form.Deactivate -= new EventHandler
(Form_Deactivate);
- hooked_form.Closed -= new EventHandler (Form_Closed);
- hooked_form.Resize -= new EventHandler (Form_Resize);
-
- hooked_form = null;
- }
-
private void HookupControlEvents (Control control)
{
if (!controls.Contains (control)) {
@@ -713,7 +702,20 @@
control.MouseLeave -= new EventHandler
(control_MouseLeave);
control.MouseDown -= new MouseEventHandler
(control_MouseDown);
}
+#endif
+ private void UnhookFormEvents ()
+ {
+ if (hooked_form == null)
+ return;
+ hooked_form.Deactivate -= new EventHandler
(Form_Deactivate);
+ hooked_form.Closed -= new EventHandler (Form_Closed);
+ hooked_form.Resize -= new EventHandler (Form_Resize);
+
+ hooked_form = null;
+ }
+
+
private void Form_Resize (object sender, EventArgs e)
{
Form f = (Form)sender;
@@ -863,7 +865,8 @@
if (last_control == sender)
last_control = null;
}
-
+
+#if NET_2_0
private void Hide (Control sender)
{
timer.Stop();
@@ -876,6 +879,7 @@
if (last_control == sender)
last_control = null;
}
+#endif
private void control_MouseMove(object sender, MouseEventArgs e)
{
if (state != TipState.Down) {
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
2008-01-23 18:06:50 UTC (rev 93682)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
2008-01-23 18:08:46 UTC (rev 93683)
@@ -1291,6 +1291,7 @@
return (x > l && x < l + 10);
}
+#if NET_2_0
private bool IsImage (TreeNode node, int x)
{
if (ImageList == null)
@@ -1305,6 +1306,7 @@
return false;
}
+#endif
private int CheckBoxLeft (TreeNode node)
{
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
