From b9ca8b86c9882974a0c6be32225a6e0e62781213 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Wed, 30 Nov 2005 22:54:07 +0000 Subject: [PATCH] * Form.cs: Property is 2.0 only * PrintDialog.cs: Signature fix. svn path=/trunk/mcs/; revision=53718 --- .../Managed.Windows.Forms/System.Windows.Forms/ChangeLog | 5 +++++ mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs | 4 ++-- .../System.Windows.Forms/PrintDialog.cs | 4 +++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog index c167fc9ed3c..cdc51e012ab 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog @@ -1,3 +1,8 @@ +2005-11-30 Jackson Harper + + * Form.cs: Property is 2.0 only + * PrintDialog.cs: Signature fix. + 2005-11-30 Peter Dennis Bartok * TextControl.cs: diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs index 1097c51f26a..fd3b877dafb 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs @@ -545,7 +545,7 @@ namespace System.Windows.Forms { // This is the menu in display and being used because of merging this can // be different then the menu that is actually assosciated with the form - public MainMenu ActiveMenu { + internal MainMenu ActiveMenu { get { if (IsMdiChild) return null; @@ -1508,7 +1508,7 @@ namespace System.Windows.Forms { case Msg.WM_NCCALCSIZE: { XplatUIWin32.NCCALCSIZE_PARAMS ncp; - if ((menu != null) && (m.WParam == (IntPtr)1)) { + if ((ActiveMenu != null) && (m.WParam == (IntPtr)1)) { ncp = (XplatUIWin32.NCCALCSIZE_PARAMS)Marshal.PtrToStructure(m.LParam, typeof(XplatUIWin32.NCCALCSIZE_PARAMS)); // Adjust for menu diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PrintDialog.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PrintDialog.cs index 0a9209b5b40..7b425de747b 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PrintDialog.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PrintDialog.cs @@ -51,6 +51,7 @@ namespace System.Windows.Forms { } +#if NET_2_0 public bool AllowCurrentPage { get { return allow_current_page; @@ -60,7 +61,8 @@ namespace System.Windows.Forms allow_current_page = value; } } - +#endif + public bool AllowPrintToFile { get { return allow_print_to_file; -- 2.25.1