Author: jackson
Date: 2005-10-31 19:35:39 -0500 (Mon, 31 Oct 2005)
New Revision: 52429
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Win32DnD.cs
Log:
* Control.cs: Consistently name the dnd methods. Make them
internal so we can override them to match some MS behavoir
internally.
* Win32DnD.cs: Use the new consistent names.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2005-10-31 23:40:55 UTC (rev 52428)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2005-11-01 00:35:39 UTC (rev 52429)
@@ -1,5 +1,12 @@
2005-10-31 Jackson Harper <[EMAIL PROTECTED]>
+ * Control.cs: Consistently name the dnd methods. Make them
+ internal so we can override them to match some MS behavoir
+ internally.
+ * Win32DnD.cs: Use the new consistent names.
+
+2005-10-31 Jackson Harper <[EMAIL PROTECTED]>
+
* TreeView.cs: Don't draw the selected node when we lose focus.
2005-10-31 Jackson Harper <[EMAIL PROTECTED]>
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
2005-10-31 23:40:55 UTC (rev 52428)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
2005-11-01 00:35:39 UTC (rev 52429)
@@ -917,21 +917,21 @@
}
}
- internal void DndEnter (DragEventArgs e)
+ internal virtual void DndEnter (DragEventArgs e)
{
try {
OnDragEnter (e);
} catch { }
}
- internal void DndOver (DragEventArgs e)
+ internal virtual void DndOver (DragEventArgs e)
{
try {
OnDragOver (e);
} catch { }
}
- internal void DndDrop (DragEventArgs e)
+ internal virtual void DndDrop (DragEventArgs e)
{
try {
OnDragDrop (e);
@@ -941,20 +941,25 @@
}
}
- internal void DndLeave (EventArgs e)
+ internal virtual void DndLeave (EventArgs e)
{
try {
OnDragLeave (e);
} catch { }
}
- internal void DnDFeedback(GiveFeedbackEventArgs e)
+ internal virtual void DndFeedback(GiveFeedbackEventArgs e)
{
- OnGiveFeedback(e);
+ try {
+ OnGiveFeedback(e);
+ } catch { }
}
- internal void DnDContinueDrag(QueryContinueDragEventArgs e) {
- OnQueryContinueDrag(e);
+ internal virtual void
DndContinueDrag(QueryContinueDragEventArgs e)
+ {
+ try {
+ OnQueryContinueDrag(e);
+ } catch { }
}
internal static MouseButtons FromParamToMouseButtons (int
param) {
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Win32DnD.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Win32DnD.cs
2005-10-31 23:40:55 UTC (rev 52428)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Win32DnD.cs
2005-11-01 00:35:39 UTC (rev 52429)
@@ -644,7 +644,7 @@
DragContinueEventArgs.escape_pressed =
fEscapePressed;
DragContinueEventArgs.key_state =
(int)grfkeyState;
-
Control.FromHandle(window).DnDContinueDrag(DragContinueEventArgs);
+
Control.FromHandle(window).DndContinueDrag(DragContinueEventArgs);
if (DragContinueEventArgs.drag_action ==
DragAction.Cancel) {
return DRAGDROP_S_CANCEL;
@@ -662,7 +662,7 @@
DragFeedbackEventArgs.effect =
(DragDropEffects)pdwEffect;
DragFeedbackEventArgs.use_default_cursors =
true;
-
Control.FromHandle(window).DnDFeedback(DragFeedbackEventArgs);
+
Control.FromHandle(window).DndFeedback(DragFeedbackEventArgs);
if (DragFeedbackEventArgs.use_default_cursors) {
return DRAGDROP_S_USEDEFAULTCURSORS;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
