Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJackson Harper <jackson@novell.com>2007-02-05 23:07:52 +0300
committerJackson Harper <jackson@novell.com>2007-02-05 23:07:52 +0300
commit203611f08d6864575fd244f513e8c800fe04538e (patch)
tree8de6b1f5b8746b2651e6e0199b4613fb96d5576b
parent482857356bfebb96fc138eac704174e4a5cd0d36 (diff)
* Cursor.cs: We want the override cursor to be reset to NULLmono-1.2.3
* when we set current cursor to the default cursor. svn path=/branches/mono-1-2-3/mcs/; revision=72324
-rw-r--r--mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog2
-rw-r--r--mcs/class/Managed.Windows.Forms/System.Windows.Forms/Cursor.cs2
2 files changed, 3 insertions, 1 deletions
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index fe517767958..6c66c4a54bc 100644
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -3,6 +3,8 @@
* TreeView.cs: We need to check scrollbar visibility when window
visibility is updated, because non visible trees don't ever add
scrollbars.
+ * Cursor.cs: We want the override cursor to be reset to NULL when
+ we set current cursor to the default cursor.
2007-01-30 Jackson Harper <jackson@ximian.com>
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Cursor.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Cursor.cs
index 50e51bc5525..1d60aa48a35 100644
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Cursor.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Cursor.cs
@@ -200,7 +200,7 @@ namespace System.Windows.Forms {
set {
if (current != value) {
current = value;
- if (current == null){
+ if (current == null || current == Cursors.Default){
// FIXME - define and set empty cursor
XplatUI.OverrideCursor(IntPtr.Zero);
} else