Author: jpobst
Date: 2008-01-29 11:19:50 -0500 (Tue, 29 Jan 2008)
New Revision: 94260
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MdiWindowManager.cs
Log:
2008-01-29 Jonathan Pobst <[EMAIL PROTECTED]>
* Form.cs: Handle Alt-Minus for MDI children forms.
* MdiWindowManager.cs: Make ShowPopup internal so Form can call it.
Add mnemonics to the control menu.
[Fixes bug #336295]
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2008-01-29 16:13:44 UTC (rev 94259)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2008-01-29 16:19:50 UTC (rev 94260)
@@ -1,3 +1,10 @@
+2008-01-29 Jonathan Pobst <[EMAIL PROTECTED]>
+
+ * Form.cs: Handle Alt-Minus for MDI children forms.
+ * MdiWindowManager.cs: Make ShowPopup internal so Form can call it.
+ Add mnemonics to the control menu.
+ [Fixes bug #336295]
+
2008-01-28 Carlos Alberto Cortez <[EMAIL PROTECTED]>
* Binding.cs: Initial implementation bits of FormattingEnabled
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
2008-01-29 16:13:44 UTC (rev 94259)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
2008-01-29 16:19:50 UTC (rev 94260)
@@ -2208,6 +2208,9 @@
case Keys.Control | Keys.Shift | Keys.F6:
MdiParent.MdiContainer.ActivatePreviousChild ();
return true;
+ case Keys.Alt | Keys.OemMinus:
+ (this.WindowManager as
MdiWindowManager).ShowPopup (Point.Empty);
+ return true;
}
}
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MdiWindowManager.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MdiWindowManager.cs
2008-01-29 16:13:44 UTC (rev 94259)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MdiWindowManager.cs
2008-01-29 16:19:50 UTC (rev 94260)
@@ -243,13 +243,13 @@
icon_menu.DrawItem += new DrawItemEventHandler
(DrawIconMenuItem);
icon_menu.Click += new EventHandler (ClickIconMenuItem);
- MenuItem restore = new MenuItem ("Restore", new
EventHandler (RestoreItemHandler));
- MenuItem move = new MenuItem ("Move", new EventHandler
(MoveItemHandler));
- MenuItem size = new MenuItem ("Size", new EventHandler
(SizeItemHandler));
- MenuItem minimize = new MenuItem ("Minimize", new
EventHandler (MinimizeItemHandler));
- MenuItem maximize = new MenuItem ("Maximize", new
EventHandler (MaximizeItemHandler));
- MenuItem close = new MenuItem ("Close", new
EventHandler (CloseItemHandler));
- MenuItem next = new MenuItem ("Next", new EventHandler
(NextItemHandler));
+ MenuItem restore = new MenuItem ("&Restore", new
EventHandler (RestoreItemHandler));
+ MenuItem move = new MenuItem ("&Move", new EventHandler
(MoveItemHandler));
+ MenuItem size = new MenuItem ("&Size", new EventHandler
(SizeItemHandler));
+ MenuItem minimize = new MenuItem ("Mi&nimize", new
EventHandler (MinimizeItemHandler));
+ MenuItem maximize = new MenuItem ("Ma&ximize", new
EventHandler (MaximizeItemHandler));
+ MenuItem close = new MenuItem ("&Close", new
EventHandler (CloseItemHandler));
+ MenuItem next = new MenuItem ("Nex&t", new EventHandler
(NextItemHandler));
icon_menu.MenuItems.AddRange (new MenuItem [] {
restore, move, size, minimize,
maximize, close, next });
@@ -270,7 +270,7 @@
ShowPopup (pnt);
}
- private void ShowPopup (Point pnt)
+ internal void ShowPopup (Point pnt)
{
icon_popup_menu.MenuItems[0].Enabled =
form.window_state != FormWindowState.Normal; // restore
icon_popup_menu.MenuItems[1].Enabled =
form.window_state != FormWindowState.Maximized; // move
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
