Author: pbartok
Date: 2005-05-24 12:55:58 -0400 (Tue, 24 May 2005)
New Revision: 44932
Added:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Help.cs
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Clipboard.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataFormats.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataObject.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/LinkArea.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/SelectionRangeConverter.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIOSX.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
Log:
2005-05-24 Peter Bartok <[EMAIL PROTECTED]>
* Help.cs: Added, implemented trivial functions, throws up MessageBox
when user tries to get help
* DataObject.cs, DataFormats.cs, LinkArea.cs,
SelectionRangeConverter.cs, Clipboard.cs : Removed unused variables
to suppress warnings
* XplatUIWin32.cs, XplatUIOSX.cs, XplatUIX11.cs: Removed unused code to
avoid unreachable code warning
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2005-05-24 16:40:05 UTC (rev 44931)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2005-05-24 16:55:58 UTC (rev 44932)
@@ -1,3 +1,13 @@
+2005-05-24 Peter Bartok <[EMAIL PROTECTED]>
+
+ * Help.cs: Added, implemented trivial functions, throws up MessageBox
+ when user tries to get help
+ * DataObject.cs, DataFormats.cs, LinkArea.cs,
+ SelectionRangeConverter.cs, Clipboard.cs : Removed unused variables
+ to suppress warnings
+ * XplatUIWin32.cs, XplatUIOSX.cs, XplatUIX11.cs: Removed unused code to
+ avoid unreachable code warning
+
2005-05-20 Peter Bartok <[EMAIL PROTECTED]>
* CursorConverter.cs (ConvertTo): Switched to use Cursor.GetObjectData
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Clipboard.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Clipboard.cs
2005-05-24 16:40:05 UTC (rev 44931)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Clipboard.cs
2005-05-24 16:55:58 UTC (rev 44932)
@@ -60,7 +60,6 @@
public static IDataObject GetDataObject() {
DataObject clipboard;
IntPtr clipboard_handle;
- IntPtr retrieve_handle;
int[] native_formats;
DataFormats.Format item_format;
object managed_clipboard_item;
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataFormats.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataFormats.cs
2005-05-24 16:40:05 UTC (rev 44931)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataFormats.cs
2005-05-24 16:55:58 UTC (rev 44932)
@@ -182,8 +182,6 @@
}
public static Format GetFormat(string format) {
- Format f;
-
if (!initialized) {
Initialize();
}
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataObject.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataObject.cs
2005-05-24 16:40:05 UTC (rev 44931)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataObject.cs
2005-05-24 16:55:58 UTC (rev 44932)
@@ -44,8 +44,6 @@
#region Constructors
internal Entry(string type, object data, bool
autoconvert) {
- Entry e;
-
this.type = type;
this.data = data;
this.autoconvert = autoconvert;
Added: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Help.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Help.cs
2005-05-24 16:40:05 UTC (rev 44931)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Help.cs
2005-05-24 16:55:58 UTC (rev 44932)
@@ -0,0 +1,70 @@
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// Copyright (c) 2005 Novell, Inc. (http://www.novell.com)
+//
+// Authors:
+// Peter Bartok ([EMAIL PROTECTED])
+//
+//
+
+// NOT COMPLETE
+
+using System;
+using System.Drawing;
+
+namespace System.Windows.Forms {
+ public class Help {
+ #region Constructor
+ private Help() {
+ }
+ #endregion
+
+ #region Public Static Methods
+ public static void ShowHelp(Control parent, string url) {
+ ShowHelp(parent, url, HelpNavigator.TableOfContents,
null);
+ }
+
+ public static void ShowHelp(Control parent, string url,
HelpNavigator navigator) {
+ ShowHelp(parent, url, navigator, null);
+ }
+
+ [MonoTODO("Create glue code to tie into libCHM")]
+ public static void ShowHelp(Control parent, string url,
HelpNavigator command, object param) {
+ MessageBox.Show(parent, (string)Locale.GetText("Help ("
+ command + "(" + param.ToString() + ")) not yet implemented"),
(string)Locale.GetText("Popup Help"), MessageBoxButtons.OK,
MessageBoxIcon.Stop);
+ }
+
+ public static void ShowHelp(Control parent, string url, string
keyword) {
+ if (keyword == null || keyword == String.Empty) {
+ ShowHelp(parent, url,
HelpNavigator.TableOfContents, null);
+ }
+ ShowHelp(parent, url, HelpNavigator.Topic, keyword);
+ }
+
+ public static void ShowHelpIndex(Control parent, string url) {
+ ShowHelp(parent, url, HelpNavigator.Index, null);
+ }
+
+ [MonoTODO("Create glue code to tie into libCHM")]
+ public static void ShowPopup(Control parent, string caption,
Point location) {
+ MessageBox.Show(parent, (string)Locale.GetText("Popup
Help not yet implemented"), (string)Locale.GetText("Popup Help"),
MessageBoxButtons.OK, MessageBoxIcon.Stop);
+ }
+ #endregion // Public Static Methods
+ }
+}
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/LinkArea.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/LinkArea.cs
2005-05-24 16:40:05 UTC (rev 44931)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/LinkArea.cs
2005-05-24 16:55:58 UTC (rev 44932)
@@ -58,7 +58,6 @@
}
public override object
ConvertFrom(ITypeDescriptorContext context, System.Globalization.CultureInfo
culture, object value) {
- string s;
string[] parts;
int start;
int length;
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/SelectionRangeConverter.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/SelectionRangeConverter.cs
2005-05-24 16:40:05 UTC (rev 44931)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/SelectionRangeConverter.cs
2005-05-24 16:55:58 UTC (rev 44932)
@@ -52,7 +52,6 @@
}
public override object ConvertFrom(ITypeDescriptorContext
context, System.Globalization.CultureInfo culture, object value) {
- string s;
string[] parts;
DateTime start;
DateTime end;
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIOSX.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIOSX.cs
2005-05-24 16:40:05 UTC (rev 44931)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIOSX.cs
2005-05-24 16:55:58 UTC (rev 44932)
@@ -867,13 +867,10 @@
internal override IntPtr ClipboardOpen() {
throw new NotImplementedException();
-
- return new IntPtr ();
}
internal override object ClipboardRetrieve(IntPtr handle, int
id, XplatUI.ClipboardToObject converter) {
throw new NotImplementedException();
- return null;
}
internal override void ClipboardStore(IntPtr handle, object
obj, int type, XplatUI.ObjectToClipboard converter) {
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs
2005-05-24 16:40:05 UTC (rev 44931)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs
2005-05-24 16:55:58 UTC (rev 44932)
@@ -1887,7 +1887,6 @@
return;
}
}
- return;
}
internal override int KeyboardSpeed {
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
2005-05-24 16:40:05 UTC (rev 44931)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
2005-05-24 16:55:58 UTC (rev 44932)
@@ -901,7 +901,6 @@
} else if (Clipboard.Item is
string) {
IntPtr buffer;
int buflen;
- byte b;
buffer =
Marshal.StringToHGlobalAnsi((string)Clipboard.Item);
buflen = 0;
@@ -1533,8 +1532,6 @@
}
internal override object ClipboardRetrieve(IntPtr handle, int
type, XplatUI.ClipboardToObject converter) {
- int target_type;
-
XConvertSelection(DisplayHandle,
NetAtoms[(int)NA.CLIPBOARD], type, type, FosterParent, IntPtr.Zero);
Clipboard.Retrieving = true;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
