Author: rolf
Date: 2007-05-31 10:57:21 -0400 (Thu, 31 May 2007)
New Revision: 78338
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/MessageBox.cs
Log:
* Control.cs: Corcompare issues.
* MessageBox.cs: Implemented missing 2.0 functions.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-05-31 14:50:01 UTC (rev 78337)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-05-31 14:57:21 UTC (rev 78338)
@@ -1,5 +1,10 @@
2007-05-31 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
+ * Control.cs: Corcompare issues.
+ * MessageBox.cs: Implemented missing 2.0 functions.
+
+2007-05-31 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
+
* CheckedListBox.cs, ListBox.cs, ListControl.cs, ComboBox.cs:
Implemented more 2.0 members.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
2007-05-31 14:50:01 UTC (rev 78337)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
2007-05-31 14:57:21 UTC (rev 78338)
@@ -2797,6 +2797,9 @@
}
#if NET_2_0
+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+ [EditorBrowsable(EditorBrowsableState.Advanced)]
+ [Browsable(false)]
[MonoNotSupported ("RTL is not supported")]
public bool IsMirrored {
get { return false; }
@@ -3152,7 +3155,10 @@
}
}
-#if NET_2_0
+#if NET_2_0
+ [EditorBrowsable(EditorBrowsableState.Always)]
+ [Browsable(true)]
+ [DefaultValue (false)]
public bool UseWaitCursor {
get { return use_wait_cursor; }
set {
@@ -3773,6 +3779,7 @@
}
#if NET_2_0
+ [EditorBrowsable(EditorBrowsableState.Advanced)]
public PreProcessControlState PreProcessControlMessage (ref
Message msg)
{
return PreProcessControlMessageInternal (ref msg);
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MessageBox.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MessageBox.cs
2007-05-31 14:50:01 UTC (rev 78337)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MessageBox.cs
2007-05-31 14:57:21 UTC (rev 78338)
@@ -61,6 +61,10 @@
int button_left;
Button[] buttons = new Button[4];
bool show_help;
+ string help_file_path;
+ string help_keyword;
+ HelpNavigator help_navigator;
+ object help_param;
#endregion // MessageBoxFrom Local Variables
#region MessageBoxForm Constructors
@@ -147,6 +151,14 @@
#endregion // Protected Instance Properties
#region MessageBoxForm Methods
+ internal void SetHelpData (string file_path, string
keyword, HelpNavigator navigator, object param)
+ {
+ help_file_path = file_path;
+ help_keyword = keyword;
+ help_navigator = navigator;
+ help_param = param;
+ }
+
public DialogResult RunDialog ()
{
this.StartPosition =
FormStartPosition.CenterScreen;
@@ -561,6 +573,94 @@
icon,
defaultButton, options, displayHelpButton);
return form.RunDialog ();
}
+
+ [MonoTODO ("Help is not implemented")]
+ public static DialogResult Show (string text, string caption,
MessageBoxButtons buttons, MessageBoxIcon icon,
+ MessageBoxDefaultButton
defaultButton, MessageBoxOptions options,
+ string helpFilePath)
+ {
+ MessageBoxForm form = new MessageBoxForm (null, text,
caption, buttons,
+ icon,
defaultButton, options, true);
+ form.SetHelpData (helpFilePath, null,
HelpNavigator.TableOfContents, null);
+ return form.RunDialog ();
+ }
+
+ [MonoTODO ("Help is not implemented")]
+ public static DialogResult Show (string text, string caption,
MessageBoxButtons buttons, MessageBoxIcon icon,
+ MessageBoxDefaultButton
defaultButton, MessageBoxOptions options,
+ string helpFilePath, string
keyword)
+ {
+ MessageBoxForm form = new MessageBoxForm (null, text,
caption, buttons,
+ icon,
defaultButton, options, true);
+ form.SetHelpData (helpFilePath, keyword,
HelpNavigator.TableOfContents, null);
+ return form.RunDialog ();
+ }
+
+ [MonoTODO ("Help is not implemented")]
+ public static DialogResult Show (string text, string caption,
MessageBoxButtons buttons, MessageBoxIcon icon,
+ MessageBoxDefaultButton
defaultButton, MessageBoxOptions options,
+ string helpFilePath,
HelpNavigator navigator)
+ {
+ MessageBoxForm form = new MessageBoxForm (null, text,
caption, buttons,
+ icon,
defaultButton, options, true);
+ form.SetHelpData (helpFilePath, null, navigator, null);
+ return form.RunDialog ();
+ }
+
+ [MonoTODO ("Help is not implemented")]
+ public static DialogResult Show (string text, string caption,
MessageBoxButtons buttons, MessageBoxIcon icon,
+ MessageBoxDefaultButton
defaultButton, MessageBoxOptions options,
+ string helpFilePath,
HelpNavigator navigator, object param)
+ {
+ MessageBoxForm form = new MessageBoxForm (null, text,
caption, buttons,
+ icon,
defaultButton, options, true);
+ form.SetHelpData (helpFilePath, null, navigator, param);
+ return form.RunDialog ();
+ }
+
+ [MonoTODO ("Help is not implemented")]
+ public static DialogResult Show (IWin32Window owner, string
text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon,
+ MessageBoxDefaultButton
defaultButton, MessageBoxOptions options,
+ string helpFilePath)
+ {
+ MessageBoxForm form = new MessageBoxForm (owner, text,
caption, buttons,
+ icon,
defaultButton, options, true);
+ form.SetHelpData (helpFilePath, null,
HelpNavigator.TableOfContents, null);
+ return form.RunDialog ();
+ }
+
+ [MonoTODO ("Help is not implemented")]
+ public static DialogResult Show (IWin32Window owner, string
text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon,
+ MessageBoxDefaultButton
defaultButton, MessageBoxOptions options,
+ string helpFilePath, string
keyword)
+ {
+ MessageBoxForm form = new MessageBoxForm (owner, text,
caption, buttons,
+ icon,
defaultButton, options, true);
+ form.SetHelpData (helpFilePath, keyword,
HelpNavigator.TableOfContents, null);
+ return form.RunDialog ();
+ }
+
+ [MonoTODO ("Help is not implemented")]
+ public static DialogResult Show (IWin32Window owner, string
text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon,
+ MessageBoxDefaultButton
defaultButton, MessageBoxOptions options,
+ string helpFilePath,
HelpNavigator navigator)
+ {
+ MessageBoxForm form = new MessageBoxForm (owner, text,
caption, buttons,
+ icon,
defaultButton, options, true);
+ form.SetHelpData (helpFilePath, null, navigator, null);
+ return form.RunDialog ();
+ }
+
+ [MonoTODO ("Help is not implemented")]
+ public static DialogResult Show (IWin32Window owner, string
text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon,
+ MessageBoxDefaultButton
defaultButton, MessageBoxOptions options,
+ string helpFilePath,
HelpNavigator navigator, object param)
+ {
+ MessageBoxForm form = new MessageBoxForm (owner, text,
caption, buttons,
+ icon,
defaultButton, options, true);
+ form.SetHelpData (helpFilePath, null, navigator, param);
+ return form.RunDialog ();
+ }
#endif
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
