* DataGridView.cs, TextControl.cs, ProgressBar.cs, PrintDialog.cs,

  MessageBox.cs, ButtonBase.cs, PageSetupDialog.cs, NumericUpDown.cs,
  X11Dnd.cs, Binding.cs, DataGrid.cs, AxHost.cs,
  LinkLabelLinkClickedEventArgs.cs, TextRenderer.cs, Label.cs,
  LinkLabel.cs, TreeNode.cs, BindingSource.cs, TabPage.cs,
  TextBoxBase.cs, BindingNavigator.cs, Application.cs,
  ToolStripPanel.cs, TabControl.cs, ThemeClearlooks.cs, TreeView.cs:
  Remove warnings.
* X11Structs.cs: Remove warnings, add ToString implementations.

svn path=/trunk/mcs/; revision=81865

mcs/class/Managed.Windows.Forms/System.Windows.Forms/Application.cs

@@ -139,9 +139,9 @@ namespace System.Windows.Forms {
 		private static string			safe_caption_format	= "{1} - {0} - {2}";
 		private static ArrayList		message_filters		= new ArrayList();
 		private static FormCollection		forms			= new FormCollection ();
-		private static bool			use_wait_cursor		= false;
 
 #if NET_2_0
+		private static bool use_wait_cursor = false;
 		private static ToolStrip keyboard_capture;
 		private static VisualStyleState visual_style_state = VisualStyleState.ClientAndNonClientAreasEnabled;
 #endif

mcs/class/Managed.Windows.Forms/System.Windows.Forms/AxHost.cs

@@ -600,13 +600,13 @@ namespace System.Windows.Forms {
 
 #if NET_2_0
 		[EditorBrowsable (EditorBrowsableState.Never)]
-		public void DrawToBitmap (Bitmap bitmap, Rectangle targetBounds)
+		public new void DrawToBitmap (Bitmap bitmap, Rectangle targetBounds)
 		{
 			throw new NotImplementedException("COM/ActiveX support is not implemented");
 		}
 
 		[EditorBrowsable (EditorBrowsableState.Advanced)]
-		protected virtual Rectangle GetScaledBounds (Rectangle bounds, SizeF factor, BoundsSpecified specified)
+		protected new virtual Rectangle GetScaledBounds (Rectangle bounds, SizeF factor, BoundsSpecified specified)
 		{
 			throw new NotImplementedException("COM/ActiveX support is not implemented");
 		}

mcs/class/Managed.Windows.Forms/System.Windows.Forms/Binding.cs

@@ -113,6 +113,9 @@ namespace System.Windows.Forms {
 		}
 		#endregion	// Protected Instance Methods
 
+		internal string DataMember {
+			get { return data_member; }
+		}
 		
 		internal void SetControl (Control control)
 		{

mcs/class/Managed.Windows.Forms/System.Windows.Forms/BindingNavigator.cs

@@ -45,7 +45,7 @@ namespace System.Windows.Forms
 
 		private ToolStripItem addNewItem = null;
 		private BindingSource bindingSource = null;
-		private bool changingText = false;
+		//private bool changingText = false;
 		private ToolStripItem countItem = null;
 		private string countItemFormat = Locale.GetText("of {0}");
 		private ToolStripItem deleteItem = null;
@@ -318,7 +318,7 @@ namespace System.Windows.Forms
 			{
 				bool isNull = (bindingSource == null);
 				initFlag = true;
-				changingText = true;
+				//changingText = true;
 
 				if (addNewItem != null)
 					addNewItem.Enabled = isNull ? addNewItem.Enabled : this.bindingSource.AllowNew;
@@ -346,7 +346,7 @@ namespace System.Windows.Forms
 			}
 			finally
 			{
-				changingText = false;
+				//changingText = false;
 				initFlag = false;
 			}
 		}
@@ -444,7 +444,7 @@ namespace System.Windows.Forms
 			OnRefreshItems();
 		}
 
-		private void OnPositionTextChanged(object sender, EventArgs e)
+		/*private void OnPositionTextChanged(object sender, EventArgs e)
 		{
 			if (changingText)
 				return;
@@ -479,7 +479,7 @@ namespace System.Windows.Forms
 				changingText = false;
 				OnRefreshItems();
 			}
-		}
+		}*/
 
 		#endregion
 	}

mcs/class/Managed.Windows.Forms/System.Windows.Forms/BindingSource.cs

@@ -42,7 +42,7 @@ namespace System.Windows.Forms {
 		ISite site;
 
 		IList list;
-		bool list_defaulted;
+		//bool list_defaulted;
 
 		object datasource;
 		string datamember;
@@ -122,7 +122,7 @@ namespace System.Windows.Forms {
 
 			if (datasource == null) {
 				l = new BindingList<object>();
-				list_defaulted = true;
+//				list_defaulted = true;
 			}
 			else if (datasource is IList) {
 				l = (IList)datasource;

mcs/class/Managed.Windows.Forms/System.Windows.Forms/ButtonBase.cs

@@ -47,14 +47,16 @@ namespace System.Windows.Forms {
 		internal ContentAlignment	text_alignment;
 		private bool			is_default;
 		internal bool			is_pressed;
-		private bool			enter_state;
+//		private bool			enter_state;
 		internal StringFormat		text_format;
 		internal bool 			paint_as_acceptbutton;
 		
 		// Properties are 2.0, but variables used in 1.1 for common drawing code
 		private bool			auto_ellipsis;
 		private FlatButtonAppearance	flat_button_appearance;
+#if NET_2_0		
 		private string			image_key;
+#endif
 		private TextImageRelation	text_image_relation;
 		private TextFormatFlags		text_format_flags;
 		private bool			use_mnemonic;
@@ -192,7 +194,9 @@ namespace System.Windows.Forms {
 				if (this.image != value) {
 					this.image = value;
 					this.image_index = -1;
+#if NET_2_0
 					this.image_key = string.Empty;
+#endif
 					this.image_list = null;
 
 #if NET_2_0
@@ -237,7 +241,9 @@ namespace System.Windows.Forms {
 				if (this.image_index != value) {
 					this.image_index = value;
 					this.image = null;
+#if NET_2_0
 					this.image_key = string.Empty;
+#endif
 					Invalidate ();
 				}
 			}

mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog

@@ -1,3 +1,15 @@
+2007-07-12  Rolf Bjarne Kvinge <[email protected]> 
+
+	* DataGridView.cs, TextControl.cs, ProgressBar.cs, PrintDialog.cs,
+	  MessageBox.cs, ButtonBase.cs, PageSetupDialog.cs, NumericUpDown.cs,
+	  X11Dnd.cs, Binding.cs, DataGrid.cs, AxHost.cs,
+	  LinkLabelLinkClickedEventArgs.cs, TextRenderer.cs, Label.cs,
+	  LinkLabel.cs, TreeNode.cs, BindingSource.cs, TabPage.cs,
+	  TextBoxBase.cs, BindingNavigator.cs, Application.cs,
+	  ToolStripPanel.cs, TabControl.cs, ThemeClearlooks.cs, TreeView.cs:
+	  Remove warnings.
+	* X11Structs.cs: Remove warnings, add ToString implementations.
+
 2007-07-11  Rolf Bjarne Kvinge <[email protected]> 
 
 	* XplatUIX11.cs: Translate min/max size according to the actual min/max

mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGrid.cs

@@ -2592,7 +2592,7 @@ namespace System.Windows.Forms
 			using (Graphics g = base.CreateGraphics ()) {
 				GridColumnStylesCollection columns = CurrentTableStyle.GridColumnStyles;
 				int colCount = columns.Count;
-				int rowCount = source.Count;
+				//int rowCount = source.Count;
 				int height = 0;
 				for (int i = 0; i < colCount; i++) {
 					object val = columns[i].GetColumnValueAtRow (source, row);

mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridView.cs

@@ -1320,10 +1320,10 @@ namespace System.Windows.Forms {
 
 		[Browsable (false)]
 		[EditorBrowsable (EditorBrowsableState.Never)]
-		public new event EventHandler BackgroundImageLayoutChanged; /* XXX {
+		public new event EventHandler BackgroundImageLayoutChanged  {
 			add { base.BackgroundImageLayoutChanged += value; }
 			remove { base.BackgroundImageLayoutChanged -= value; }
-		} */
+		}
 
 		public event EventHandler BorderStyleChanged {
 			add { Events.AddHandler (BorderStyleChangedEvent, value); }

mcs/class/Managed.Windows.Forms/System.Windows.Forms/Label.cs

@@ -55,7 +55,9 @@ namespace System.Windows.Forms
 		private FlatStyle flat_style;
 		private bool use_mnemonic;
 		private int image_index = -1;
+#if NET_2_0
 		private string image_key = string.Empty;
+#endif
 		private ImageList image_list;
 		internal ContentAlignment image_align;
 		internal StringFormat string_format;
@@ -300,7 +302,9 @@ namespace System.Windows.Forms
 				if (this.image != value) {
 					this.image = value;
 					this.image_index = -1;
+#if NET_2_0
 					this.image_key = string.Empty;
+#endif
 					this.image_list = null;
 
 #if NET_2_0
@@ -356,7 +360,9 @@ namespace System.Windows.Forms
 				if (this.image_index != value) {
 					this.image_index = value;
 					this.image = null;
+#if NET_2_0
 					this.image_key = string.Empty;
+#endif
 					Invalidate ();
 				}
 			}

mcs/class/Managed.Windows.Forms/System.Windows.Forms/LinkLabel.cs

@@ -253,7 +253,7 @@ namespace System.Windows.Forms
 #if NET_2_0
 		[Browsable (false)]
 		[EditorBrowsable (EditorBrowsableState.Never)]
-		public FlatStyle FlatStyle {
+		public new FlatStyle FlatStyle {
 			get { return base.FlatStyle; }
 			set {
 				if (base.FlatStyle == value)
@@ -264,7 +264,7 @@ namespace System.Windows.Forms
 		}
 
 		[RefreshProperties (RefreshProperties.Repaint)]
-		public Padding Padding {
+		public new Padding Padding {
 			get { return base.Padding; }
 			set {
 				if (base.Padding == value)

mcs/class/Managed.Windows.Forms/System.Windows.Forms/LinkLabelLinkClickedEventArgs.cs

@@ -31,12 +31,16 @@ namespace System.Windows.Forms
 	[ComVisible(true)]
 	public class LinkLabelLinkClickedEventArgs : EventArgs 
 	{
+#if NET_2_0
 		private MouseButtons button;
+#endif
 		private LinkLabel.Link link;
 
 		public LinkLabelLinkClickedEventArgs (LinkLabel.Link link)
 		{
+#if NET_2_0
 			this.button = MouseButtons.Left;
+#endif
 			this.link = link;
 		}
 

mcs/class/Managed.Windows.Forms/System.Windows.Forms/MessageBox.cs

@@ -159,6 +159,22 @@ namespace System.Windows.Forms
 				help_param = param;
 			}
 			
+			internal string HelpFilePath {
+				get { return help_file_path; }
+			}
+			
+			internal string HelpKeyword {
+				get { return help_keyword; }
+			}
+			
+			internal HelpNavigator HelpNavigator {
+				get { return help_navigator; }
+			}
+			
+			internal object HelpParam {
+				get { return help_param; }
+			}
+			
 			public DialogResult RunDialog ()
 			{
 				this.StartPosition = FormStartPosition.CenterScreen;

mcs/class/Managed.Windows.Forms/System.Windows.Forms/NumericUpDown.cs

@@ -57,8 +57,8 @@ namespace System.Windows.Forms {
 
 #if NET_2_0
 		NumericUpDownAccelerationCollection accelerations;
-		private long buttonPressedTicks;
-		private bool isSpinning;
+//		private long buttonPressedTicks;
+		//private bool isSpinning;
 #endif
 		#endregion	// Local Variables
 
@@ -502,14 +502,14 @@ namespace System.Windows.Forms {
 
 		protected override void OnKeyUp (KeyEventArgs e)
 		{
-			isSpinning = false;
+//			isSpinning = false;
 			base.OnKeyUp (e);
 		}
 
 		protected override void OnKeyDown (KeyEventArgs e)
 		{
-			buttonPressedTicks = DateTime.Now.Ticks;
-			isSpinning = true;
+//			buttonPressedTicks = DateTime.Now.Ticks;
+//			isSpinning = true;
 			base.OnKeyDown (e);
 		}
 #endif

mcs/class/Managed.Windows.Forms/System.Windows.Forms/PageSetupDialog.cs

@@ -845,7 +845,7 @@ namespace System.Windows.Forms {
 
 			System.Text.StringBuilder sb;
 			float displayHeight;
-			Font font;
+			new Font font;
 
 			public bool Landscape
 			{
@@ -859,7 +859,7 @@ namespace System.Windows.Forms {
 				}
 			}
 
-			public float Height {
+			public new float Height {
 				get { return displayHeight; }
 				set { 
 					if (displayHeight != value) {

mcs/class/Managed.Windows.Forms/System.Windows.Forms/PrintDialog.cs

@@ -645,7 +645,7 @@ namespace System.Windows.Forms
 				}
 			}
 
-			Font font;
+			new Font font;
 
 			public CollatePreview () 
 			{

mcs/class/Managed.Windows.Forms/System.Windows.Forms/ProgressBar.cs

@@ -65,7 +65,9 @@ namespace System.Windows.Forms
 
 		#region events
 
+#if NET_2_0
 		static object RightToLeftLayoutChangedEvent = new object ();
+#endif
 			
 #if ONLY_1_1
 		[Browsable (false)]

mcs/class/Managed.Windows.Forms/System.Windows.Forms/TabControl.cs

@@ -57,8 +57,9 @@ namespace System.Windows.Forms {
 		private ButtonState right_slider_state;
 		private ButtonState left_slider_state;
 		private int slider_pos = 0;
-
+#if NET_2_0
 		private bool rightToLeftLayout;
+#endif		
 		#endregion	// Fields
 
 		#region Public Constructors
@@ -1278,7 +1279,7 @@ namespace System.Windows.Forms {
 			this.Controls.SetChildIndex (value, index);
 			Redraw ();
 		}
-
+#if NET_2_0
 		private void InsertTab (int index, TabPage value)
 		{
 			if (!tab_pages.Contains (value)) {
@@ -1287,7 +1288,7 @@ namespace System.Windows.Forms {
 			this.Controls.SetChildIndex (value, index);
 			Redraw ();
 		}
-
+#endif
 		internal void Redraw ()
 		{
 			if (!IsHandleCreated)

mcs/class/Managed.Windows.Forms/System.Windows.Forms/TabPage.cs

@@ -37,7 +37,9 @@ namespace System.Windows.Forms {
 	public class TabPage : Panel {
 		#region Fields
 		private int imageIndex = -1;
+#if NET_2_0
 		private string imageKey;
+#endif
 		private string tooltip_text = String.Empty;
 		private Rectangle tab_bounds;
 		private int row;

mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs

@@ -932,7 +932,7 @@ namespace System.Windows.Forms {
 			if (eh != null)
 				eh (this, e);
 		}
-#if NET_1_1
+#if ONLY_1_1
 		protected virtual void OnAutoSizeChanged(EventArgs e) {
 			EventHandler eh = (EventHandler)(Events [AutoSizeChangedEvent]);
 			if (eh != null)

mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextControl.cs

@@ -2339,7 +2339,7 @@ namespace System.Windows.Forms {
 		
 		internal void InsertPicture (Line line, int pos, RTF.Picture picture)
 		{
-			LineTag next_tag;
+			//LineTag next_tag;
 			LineTag tag;
 			int len;
 
@@ -2352,7 +2352,7 @@ namespace System.Windows.Forms {
 
 			tag = LineTag.FindTag (line, pos);
 			picture_tag.CopyFormattingFrom (tag);
-			next_tag = tag.Break (pos + 1);
+			/*next_tag = */tag.Break (pos + 1);
 			picture_tag.previous = tag;
 			picture_tag.next = tag.next;
 			tag.next = picture_tag;
@@ -4841,8 +4841,8 @@ namespace System.Windows.Forms {
 		private Stack		undo_actions;
 		private Stack		redo_actions;
 
-		private int		caret_line;
-		private int		caret_pos;
+		//private int		caret_line;
+		//private int		caret_pos;
 
 		// When performing an action, we lock the queue, so that the action can't be undone
 		private bool locked;

mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextRenderer.cs

@@ -411,7 +411,7 @@ namespace System.Windows.Forms
 
 			return sf;
 		}
-
+#if NET_2_0
 		private static Rectangle PadRectangle (Rectangle r, TextFormatFlags flags)
 		{
 			if ((flags & TextFormatFlags.NoPadding) == 0 && (flags & TextFormatFlags.Right) == 0 && (flags & TextFormatFlags.HorizontalCenter) == 0) {
@@ -434,7 +434,7 @@ namespace System.Windows.Forms
 
 			return r;
 		}
-
+#endif
 		private static Rectangle PadDrawStringRectangle (Rectangle r, TextFormatFlags flags)
 		{
 			if ((flags & TextFormatFlags.NoPadding) == 0 && (flags & TextFormatFlags.Right) == 0 && (flags & TextFormatFlags.HorizontalCenter) == 0) {

mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeClearlooks.cs

@@ -164,8 +164,9 @@ namespace System.Windows.Forms {
 		}
 		
 		static readonly Color info_border_color = Color.FromArgb (218, 178, 85);
+#if NET_2_0
 		static readonly Color info_second_color = Color.FromArgb (220, 220, 160);
-		
+#endif	
 		public override Image Images(UIIcon index, int size) {
 			switch (index) {
 			case UIIcon.PlacesRecentDocuments:

mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripPanel.cs

@@ -419,7 +419,7 @@ namespace System.Windows.Forms
 			this.rows.Add (new_row);
 			new_row.OnControlAdded (control, 0);
 		}
-		
+		/*
 		private Region FindBackgroundRegion ()
 		{
 			Region r = new Region (this.Bounds);
@@ -429,6 +429,7 @@ namespace System.Windows.Forms
 
 			return r;
 		}
+		*/
 		#endregion
 
 		#region Nested Classes

mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeNode.cs

@@ -43,8 +43,10 @@ namespace System.Windows.Forms {
 		private string text;
 		private int image_index = -1;
 		private int selected_image_index = -1;
-        private string image_key = String.Empty;
-        private string selected_image_key = String.Empty;
+#if NET_2_0
+		private string image_key = String.Empty;
+		private string selected_image_key = String.Empty;
+#endif
         internal TreeNodeCollection nodes;
 		internal TreeViewAction check_reason = TreeViewAction.Unknown;
 

mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs

@@ -667,18 +667,11 @@ namespace System.Windows.Forms {
 		}
 
 #if NET_2_0
-		public
-#else
-		private
-#endif
-		void Sort ()
+		public	void Sort ()
 		{
-#if NET_2_0
 			Sort (Nodes.Count >= 2 ? tree_view_node_sorter : null);
-#else
-			Sort (null);
-#endif
 		}
+#endif
 
 		void Sort (IComparer sorter) 
 		{
@@ -1726,10 +1719,10 @@ namespace System.Windows.Forms {
 			XplatUI.ScrollWindow (Handle, ViewportRectangle, 0, y_move, false);
 		}
 
-		private void SetVScrollTop (TreeNode new_top)
+		/*private void SetVScrollTop (TreeNode new_top)
 		{
 			vbar.Value = new_top.visible_order - VisibleCount;
-		}
+		}*/
 
 		private void HScrollBarValueChanged(object sender, EventArgs e)
 		{

mcs/class/Managed.Windows.Forms/System.Windows.Forms/X11Dnd.cs

@@ -345,12 +345,12 @@ namespace System.Windows.Forms {
 
 		private bool tracking = false;
 		private bool dropped = false;
-		private X11Keyboard keyboard;
+		//private X11Keyboard keyboard;
 
 		public X11Dnd (IntPtr display, X11Keyboard keyboard)
 		{
 			this.display = display;
-			this.keyboard = keyboard;
+			//this.keyboard = keyboard;
 
 			Init ();
 		}

mcs/class/Managed.Windows.Forms/System.Windows.Forms/X11Structs.cs

@@ -553,21 +553,64 @@ namespace System.Windows.Forms {
 		public override string ToString() {
 			switch (type)
 			{
+				case XEventName.ButtonPress:
+				case XEventName.ButtonRelease:
+					return ToString (ButtonEvent);
+				case XEventName.CirculateNotify:
+				case XEventName.CirculateRequest:
+					return ToString (CirculateEvent);
+				case XEventName.ClientMessage:
+					return ToString (ClientMessageEvent);
+				case XEventName.ColormapNotify:
+					return ToString (ColormapEvent);
+				case XEventName.ConfigureNotify:
+					return ToString (ConfigureEvent);
+				case XEventName.ConfigureRequest:
+					return ToString (ConfigureRequestEvent);
+				case XEventName.CreateNotify:
+					return ToString (CreateWindowEvent);
+				case XEventName.DestroyNotify:
+					return ToString (DestroyWindowEvent);
 				case XEventName.Expose:
 					return ToString (ExposeEvent);
 				case XEventName.FocusIn:
 				case XEventName.FocusOut:
 					return ToString (FocusChangeEvent);
+				case XEventName.GraphicsExpose:
+					return ToString (GraphicsExposeEvent);
+				case XEventName.GravityNotify:
+					return ToString (GravityEvent);
+				case XEventName.KeymapNotify:
+					return ToString (KeymapEvent);
+				case XEventName.MapNotify:
+					return ToString (MapEvent);
+				case XEventName.MappingNotify:
+					return ToString (MappingEvent);
+				case XEventName.MapRequest:
+					return ToString (MapRequestEvent);
+				case XEventName.MotionNotify:
+					return ToString (MotionEvent);
 				case XEventName.NoExpose:
 					return ToString (NoExposeEvent);
 				case XEventName.PropertyNotify:
 					return ToString (PropertyEvent);
+				case XEventName.ReparentNotify:
+					return ToString (ReparentEvent);
 				case XEventName.ResizeRequest:
 					return ToString (ResizeRequestEvent);
-				case XEventName.ConfigureNotify:
-					return ToString (ConfigureEvent);
-				case XEventName.MotionNotify:
-					return ToString (MotionEvent);
+				case XEventName.SelectionClear:
+					return ToString (SelectionClearEvent);
+				case XEventName.SelectionNotify:
+					return ToString (SelectionEvent);
+				case XEventName.SelectionRequest:
+					return ToString (SelectionRequestEvent);
+				case XEventName.UnmapNotify:
+					return ToString (UnmapEvent);
+				case XEventName.VisibilityNotify:
+					return ToString (VisibilityEvent);
+				case XEventName.EnterNotify:
+				case XEventName.LeaveNotify:
+					return ToString (CrossingEvent);
 				default:
 					return type.ToString ();
 			}
@@ -710,6 +753,11 @@ namespace System.Windows.Forms {
 		ColorMap	= 8192,
 		Cursor		= 16384
 	}
+	
+	internal enum SendEventValues {
+		PointerWindow = 0,
+		InputFocus = 1
+	}
 
 	internal enum CreateWindowArgs {
 		CopyFromParent	= 0,
@@ -1597,6 +1645,12 @@ namespace System.Windows.Forms {
 		public int yhot;       /* hot spot y (must be inside image) */
 		public int delay;       /* hot spot y (must be inside image) */
 		public IntPtr pixels;    /* pointer to pixels */
+
+		public override string ToString ()
+		{
+			return string.Format ("XCursorImage (version: {0}, size: {1}, width: {2}, height: {3}, xhot: {4}, yhot: {5}, delay: {6}, pixels: {7}", 
+				version, size, width, height, xhot, yhot, delay, pixels);
+		}
 	} ;
 
 	[StructLayout (LayoutKind.Sequential)]