Author: miguel
Date: 2007-03-22 18:54:42 -0500 (Thu, 22 Mar 2007)
New Revision: 74859
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/SystemInformation.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItem.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUI.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIDriver.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs
Log:
2007-03-22 Miguel de Icaza <[EMAIL PROTECTED]>
* SystemInformation.cs (MouseWheelScrollDelta): Expose this
property, its only implemented for Win32, on X11 it defaults to
some hardcoded value.
* ToolStripItem.cs (AllowDrop): Add property
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-03-22 23:35:03 UTC (rev 74858)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-03-22 23:54:42 UTC (rev 74859)
@@ -1,3 +1,11 @@
+2007-03-22 Miguel de Icaza <[EMAIL PROTECTED]>
+
+ * SystemInformation.cs (MouseWheelScrollDelta): Expose this
+ property, its only implemented for Win32, on X11 it defaults to
+ some hardcoded value.
+
+ * ToolStripItem.cs (AllowDrop): Add property
+
2007-03-22 Mike Kestner <[EMAIL PROTECTED]>
* ListView.cs : in FullRowSelect Details mode, only enable box
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/SystemInformation.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/SystemInformation.cs
2007-03-22 23:35:03 UTC (rev 74858)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/SystemInformation.cs
2007-03-22 23:54:42 UTC (rev 74859)
@@ -313,6 +313,12 @@
return XplatUI.MouseHoverTime;
}
}
+
+ public static int MouseWheelScrollDelta {
+ get {
+ return XplatUI.MouseWheelScrollDelta;
+ }
+ }
#endif
public static bool MousePresent {
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItem.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItem.cs
2007-03-22 23:35:03 UTC (rev 74858)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItem.cs
2007-03-22 23:54:42 UTC (rev 74859)
@@ -42,6 +42,7 @@
#region Private Variables
private AccessibleObject accessibility_object;
private string accessible_default_action_description;
+ private bool allow_drop;
private ToolStripItemAlignment alignment;
private AnchorStyles anchor;
private bool auto_size;
@@ -208,6 +209,17 @@
}
}
+ [MonoTODO]
+ public virtual bool AllowDrop {
+ get {
+ return this.allow_drop;
+ }
+
+ set {
+ this.allow_drop = value;
+ }
+ }
+
[Browsable (false)]
[DefaultValue (AnchorStyles.Top | AnchorStyles.Left)]
[DesignerSerializationVisibility
(DesignerSerializationVisibility.Hidden)]
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUI.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUI.cs
2007-03-22 23:35:03 UTC (rev 74858)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUI.cs
2007-03-22 23:54:42 UTC (rev 74859)
@@ -235,6 +235,12 @@
}
}
+ static public int MouseWheelScrollDelta {
+ get {
+ return driver.MouseWheelScrollDelta;
+ }
+ }
+
static public bool MouseWheelPresent {
get {
return driver.MouseWheelPresent;
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIDriver.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIDriver.cs
2007-03-22 23:35:03 UTC (rev 74858)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIDriver.cs
2007-03-22 23:54:42 UTC (rev 74859)
@@ -80,6 +80,12 @@
}
}
+ internal virtual int MouseWheelScrollDelta {
+ get {
+ return 120;
+ }
+ }
+
internal virtual Point MousePosition {
get {
return Point.Empty;
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs
2007-03-22 23:35:03 UTC (rev 74858)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs
2007-03-22 23:54:42 UTC (rev 74859)
@@ -151,6 +151,7 @@
SPI_GETMOUSEHOVERWIDTH = 0x0062,
SPI_GETMOUSEHOVERHEIGHT = 0x0064,
SPI_GETMOUSEHOVERTIME = 0x0066,
+ SPI_GETWHEELSCROLLLINES = 0x0068
}
internal enum WindowPlacementFlags {
@@ -1027,6 +1028,14 @@
}
}
+ internal override int MouseWheelScrollDelta {
+ get {
+ int delta = 120;
+
Win32SystemParametersInfo(SPIAction.SPI_GETWHEELSCROLLLINES, 0, ref delta, 0);
+ return delta;
+ }
+ }
+
internal override int HorizontalScrollBarHeight {
get {
return scroll_height;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches