Author: toshok
Date: 2006-12-05 13:35:11 -0500 (Tue, 05 Dec 2006)
New Revision: 69060
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGrid.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridTextBoxColumn.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridView.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewComboBoxCell.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DrawTreeNodeEventArgs.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/FileDialog.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/FolderBrowserDialog.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PageSetupDialog.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PictureBox.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PrintControllerWithStatusDialog.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PrintDialog.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Splitter.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TabPage.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Win32DnD.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs
Log:
* DataGridView.cs: fix compiler warnings.
* PrintControllerWithStatusDialog.cs: same.
* ToolBar.cs: same.
* FolderBrowserDialog.cs: same.
* Splitter.cs: same.
* DataGridViewComboBoxCell.cs: same.
* XplatUIWin32.cs: same.
* PictureBox.cs: same.
* Win32DnD.cs: same.
* PageSetupDialog.cs: same.
* FileDialog.cs: same.
* PrintDialog.cs: same.
* DataGridTextBoxColumn.cs: same.
* DrawTreeNodeEventArgs.cs: same (and fix corcompare)
2006-12-05 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
2006-12-05 18:20:21 UTC (rev 69059)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-12-05 18:35:11 UTC (rev 69060)
@@ -1,5 +1,35 @@
2006-12-05 Chris Toshok <[EMAIL PROTECTED]>
+ * DataGridView.cs: fix compiler warnings.
+
+ * PrintControllerWithStatusDialog.cs: same.
+
+ * ToolBar.cs: same.
+
+ * FolderBrowserDialog.cs: same.
+
+ * Splitter.cs: same.
+
+ * DataGridViewComboBoxCell.cs: same.
+
+ * XplatUIWin32.cs: same.
+
+ * PictureBox.cs: same.
+
+ * Win32DnD.cs: same.
+
+ * PageSetupDialog.cs: same.
+
+ * FileDialog.cs: same.
+
+ * PrintDialog.cs: same.
+
+ * DataGridTextBoxColumn.cs: same.
+
+ * DrawTreeNodeEventArgs.cs: same (and fix corcompare)
+
+2006-12-05 Chris Toshok <[EMAIL PROTECTED]>
+
* TextBox.cs, CheckedListBox.cs, MonthCalendar.cs, Menu.cs,
MainMenu.cs, ListView.cs, LabelEditTextBox.cs, ToolBar.cs: more
System.ComponentModel.EventHandlerList work.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGrid.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGrid.cs
2006-12-05 18:20:21 UTC (rev 69059)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGrid.cs
2006-12-05 18:35:11 UTC (rev 69060)
@@ -195,7 +195,8 @@
static readonly Color def_parentrowsfore_color =
ThemeEngine.Current.DataGridParentRowsForeColor;
/* colors */
- Color background_color;
+ // XXX this needs addressing. Control.background_color should
not be internal.
+ new Color background_color;
Color caption_backcolor;
Color caption_forecolor;
Color parentrowsback_color;
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridTextBoxColumn.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridTextBoxColumn.cs
2006-12-05 18:20:21 UTC (rev 69059)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridTextBoxColumn.cs
2006-12-05 18:35:11 UTC (rev 69060)
@@ -138,7 +138,7 @@
SetColumnValueAtRow
(dataSource, rowNum, textbox.Text);
}
}
- catch (Exception e) {
+ catch {
return false;
}
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridView.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridView.cs
2006-12-05 18:20:21 UTC (rev 69059)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridView.cs
2006-12-05 18:35:11 UTC (rev 69060)
@@ -78,7 +78,7 @@
private string dataMember;
private object dataSource;
private DataGridViewCellStyle defaultCellStyle;
- private Control editingControl;
+ //private Control editingControl;
private DataGridViewEditMode editMode;
private bool enableHeadersVisualStyles;
private DataGridViewCell firstDisplayedCell;
@@ -88,7 +88,7 @@
private Color gridColor =
Color.FromKnownColor(KnownColor.ControlDarkDark);
private int horizontalScrollingOffset;
private bool isCurrentCellDirty;
- private bool isCurrentRowDirty;
+ //private bool isCurrentRowDirty;
private bool multiSelect;
private bool readOnly;
private DataGridViewHeaderBorderStyle rowHeadersBorderStyle;
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewComboBoxCell.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewComboBoxCell.cs
2006-12-05 18:20:21 UTC (rev 69059)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewComboBoxCell.cs
2006-12-05 18:35:11 UTC (rev 69060)
@@ -238,10 +238,10 @@
private ArrayList list;
- private DataGridViewComboBoxCell owner;
+ //private DataGridViewComboBoxCell owner;
public ObjectCollection (DataGridViewComboBoxCell
owner) {
- this.owner = owner;
+ //this.owner = owner;
list = new ArrayList();
}
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DrawTreeNodeEventArgs.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DrawTreeNodeEventArgs.cs
2006-12-05 18:20:21 UTC (rev 69059)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DrawTreeNodeEventArgs.cs
2006-12-05 18:35:11 UTC (rev 69060)
@@ -61,21 +61,21 @@
set { draw_default = value; }
}
- Graphics Graphics
+ public Graphics Graphics
{
get { return graphics; }
}
- TreeNode Node
+ public TreeNode Node
{
get { return node; }
}
- TreeNodeStates State
+ public TreeNodeStates State
{
get { return state; }
}
#endregion // Public Instance Properties
}
}
-#endif
\ No newline at end of file
+#endif
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/FileDialog.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/FileDialog.cs
2006-12-05 18:20:21 UTC (rev 69059)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/FileDialog.cs
2006-12-05 18:35:11 UTC (rev 69060)
@@ -1562,6 +1562,8 @@
public DirComboBox (MWFVFS vfs)
{
+ this.vfs = vfs;
+
SuspendLayout ();
DrawMode = DrawMode.OwnerDrawFixed;
@@ -1582,7 +1584,7 @@
myComputerDirComboboxItem = new DirComboBoxItem
(imageList, 3, "My Computer", MWFVFS.MyComputerPrefix, indent);
networkDirComboboxItem = new DirComboBoxItem
(imageList, 4, "My Network", MWFVFS.MyNetworkPrefix, indent);
- ArrayList al = vfs.GetMyComputerContent ();
+ ArrayList al = this.vfs.GetMyComputerContent ();
foreach (FSEntry fsEntry in al) {
myComputerItems.Add (new DirComboBoxItem
(MimeIconEngine.LargeIcons, fsEntry.IconIndex, fsEntry.Name, fsEntry.FullName,
indent * 2));
@@ -1953,7 +1955,7 @@
public MWFFileView (MWFVFS vfs)
{
this.vfs = vfs;
- vfs.RegisterUpdateDelegate (new MWFVFS.UpdateDelegate
(RealFileViewUpdate), this);
+ this.vfs.RegisterUpdateDelegate (new
MWFVFS.UpdateDelegate (RealFileViewUpdate), this);
SuspendLayout ();
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/FolderBrowserDialog.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/FolderBrowserDialog.cs
2006-12-05 18:20:21 UTC (rev 69059)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/FolderBrowserDialog.cs
2006-12-05 18:35:11 UTC (rev 69060)
@@ -307,7 +307,7 @@
internal class FolderBrowserTreeView : TreeView
{
private MWFVFS vfs = new MWFVFS ();
- private FBTreeNode root_node;
+ new private FBTreeNode root_node;
private FolderBrowserDialog parentDialog;
private ImageList imageList = new ImageList ();
private Environment.SpecialFolder rootFolder;
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PageSetupDialog.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PageSetupDialog.cs
2006-12-05 18:20:21 UTC (rev 69059)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PageSetupDialog.cs
2006-12-05 18:35:11 UTC (rev 69060)
@@ -38,8 +38,8 @@
[DefaultProperty("Document")]
public sealed class PageSetupDialog : CommonDialog {
- const int yard_pound_default = 100;
- static readonly int meter_default = (int) Math.Round (10 *
3.937 * 100);
+ //const int yard_pound_default = 100;
+ //static readonly int meter_default = (int) Math.Round (10 *
3.937 * 100);
#region Local variables
private PrintDocument document;
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PictureBox.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PictureBox.cs
2006-12-05 18:20:21 UTC (rev 69059)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PictureBox.cs
2006-12-05 18:35:11 UTC (rev 69060)
@@ -44,7 +44,9 @@
private Image image;
private PictureBoxSizeMode size_mode;
//private bool recalc;
+#if NET_2_0
private Image initial_image;
+#endif
private int no_update;
#endregion // Fields
@@ -211,7 +213,9 @@
StopAnimation ();
image = null;
}
+#if NET_2_0
initial_image = null;
+#endif
base.Dispose (disposing);
}
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PrintControllerWithStatusDialog.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PrintControllerWithStatusDialog.cs
2006-12-05 18:20:21 UTC (rev 69059)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PrintControllerWithStatusDialog.cs
2006-12-05 18:35:11 UTC (rev 69060)
@@ -34,7 +34,6 @@
public class PrintControllerWithStatusDialog : PrintController {
#region Local variables
PrintController underlyingController;
- string dialogTitle;
PrintingDialog dialog;
int currentPage;
#endregion // Local variables
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PrintDialog.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PrintDialog.cs
2006-12-05 18:20:21 UTC (rev 69059)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PrintDialog.cs
2006-12-05 18:35:11 UTC (rev 69060)
@@ -40,7 +40,9 @@
[DefaultProperty("Document")]
public sealed class PrintDialog : CommonDialog {
PrintDocument document;
+#if NET_2_0
bool allow_current_page;
+#endif
bool allow_print_to_file;
bool allow_selection;
bool allow_some_pages;
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Splitter.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Splitter.cs
2006-12-05 18:20:21 UTC (rev 69059)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Splitter.cs
2006-12-05 18:35:11 UTC (rev 69060)
@@ -50,7 +50,8 @@
#region Local Variables
static private Cursor splitter_ns;
static private Cursor splitter_we;
- private BorderStyle border_style;
+ // XXX this "new" shouldn't be here. Control shouldn't define
border_style as internal.
+ new private BorderStyle border_style;
private int min_extra;
private int min_size;
private int split_position; //
Current splitter position
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TabPage.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TabPage.cs
2006-12-05 18:20:21 UTC (rev 69059)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TabPage.cs
2006-12-05 18:35:11 UTC (rev 69060)
@@ -40,7 +40,9 @@
private string tooltip_text = String.Empty;
private Rectangle tab_bounds;
private int row;
+#if NET_2_0
private bool use_visual_style_back_color;
+#endif
#endregion // Fields
#region Public Constructors
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
2006-12-05 18:20:21 UTC (rev 69059)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
2006-12-05 18:35:11 UTC (rev 69060)
@@ -332,7 +332,7 @@
// XXX this should probably go away and it should call
// into Control.ImeMode instead.
- ImeMode ime_mode = ImeMode.Disable;
+ new ImeMode ime_mode = ImeMode.Disable;
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Win32DnD.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Win32DnD.cs
2006-12-05 18:20:21 UTC (rev 69059)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Win32DnD.cs
2006-12-05 18:35:11 UTC (rev 69060)
@@ -169,7 +169,8 @@
private static readonly Guid IID_IDropSource = new
Guid("00000121-0000-0000-C000-000000000046");
private static readonly Guid IID_IDropTarget = new
Guid("00000122-0000-0000-C000-000000000046");
- internal Win32DnD() {
+ static Win32DnD()
+ {
// Required for all other OLE functions to work
Win32OleInitialize(IntPtr.Zero);
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs
2006-12-05 18:20:21 UTC (rev 69059)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs
2006-12-05 18:35:11 UTC (rev 69060)
@@ -63,7 +63,6 @@
private static int scroll_height;
private static Hashtable wm_nc_registered;
- private static Win32DnD DnD;
#endregion // Local Variables
#region Private Structs
@@ -636,8 +635,6 @@
// Handle singleton stuff first
ref_count=0;
- DnD = new Win32DnD();
-
mouse_state = MouseButtons.None;
mouse_position = Point.Empty;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
