Przeglądaj źródła

- Properly fixed Jordi's last fix
- Now uses Cursor's Position property instead of calling XplatUI directly

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

Peter Dennis Bartok 21 lat temu
rodzic
commit
9dbdbbd11f

+ 9 - 10
mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs

@@ -29,9 +29,13 @@
 //	Jaak Simm		[email protected]
 //	Jaak Simm		[email protected]
 //	John Sohn		[email protected]
 //	John Sohn		[email protected]
 //
 //
-// $Revision: 1.47 $
+// $Revision: 1.48 $
 // $Modtime: $
 // $Modtime: $
 // $Log: Control.cs,v $
 // $Log: Control.cs,v $
+// Revision 1.48  2004/08/23 19:55:08  pbartok
+// - Properly fixed Jordi's last fix
+// - Now uses Cursor's Position property instead of calling XplatUI directly
+//
 // Revision 1.47  2004/08/23 19:16:23  jordi
 // Revision 1.47  2004/08/23 19:16:23  jordi
 // avoids null exception
 // avoids null exception
 //
 //
@@ -629,12 +633,8 @@ namespace System.Windows.Forms
 		}
 		}
 
 
 		public static Point MousePosition {
 		public static Point MousePosition {
-			get {				
-				int x;
-				int y;
-
-				XplatUI.GetCursorPos (IntPtr.Zero, out x, out y);
-				return new Point (x, y);
+			get {
+				return Cursor.Position;
 			}
 			}
 		}
 		}
 		#endregion	// Public Static Properties
 		#endregion	// Public Static Properties
@@ -722,10 +722,9 @@ namespace System.Windows.Forms
 
 
 			set {
 			set {
 				background_color=value;
 				background_color=value;
-
-				if (this.window != null)
+				if (this.IsHandleCreated) {
 					XplatUI.SetWindowBackground(this.window.Handle, value);
 					XplatUI.SetWindowBackground(this.window.Handle, value);
-
+				}
 				Refresh();
 				Refresh();
 			}
 			}
 		}
 		}