Author: everaldo
Date: 2007-03-26 04:08:02 -0500 (Mon, 26 Mar 2007)
New Revision: 74968
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/XplatUIX11-new.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/NotifyIcon.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUI.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIDriver.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:
2007-03-26 Everaldo Canuto <[EMAIL PROTECTED]>
* NotifyIcon.cs: Balloon properties and methods created.
* XplatUI.cs, XplatUIDriver.cs, XplatUIX11.cs, XplatUIWin32.cs,
XplatUIOSX.cs, XplatUIX11-new.cs: Implement ShowBalloonTip method.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-03-26 04:11:05 UTC (rev 74967)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-03-26 09:08:02 UTC (rev 74968)
@@ -1,3 +1,10 @@
+2007-03-26 Everaldo Canuto <[EMAIL PROTECTED]>
+
+ * NotifyIcon.cs: Balloon properties and methods created.
+
+ * XplatUI.cs, XplatUIDriver.cs, XplatUIX11.cs, XplatUIWin32.cs,
+ XplatUIOSX.cs, XplatUIX11-new.cs: Implement ShowBalloonTip method.
+
2007-03-25 Jonathan Pobst <[EMAIL PROTECTED]>
* ToolStripComboBox.cs: Default the ComboBox's FlatStyle to Popup.
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/NotifyIcon.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/NotifyIcon.cs
2007-03-26 04:11:05 UTC (rev 74967)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/NotifyIcon.cs
2007-03-26 09:08:02 UTC (rev 74968)
@@ -49,6 +49,9 @@
private bool systray_active;
private ToolTip tooltip;
#if NET_2_0
+ private string balloon_text;
+ private string balloon_title;
+ private ToolTipIcon balloon_icon;
private ContextMenuStrip context_menu_strip;
private object tag;
#endif
@@ -221,12 +224,31 @@
public NotifyIcon() {
window = new NotifyIconWindow(this);
systray_active = false;
+
+#if NET_2_0
+ balloon_title = "";
+ balloon_text = "";
+#endif
}
public NotifyIcon(System.ComponentModel.IContainer container) :
this() {
}
#endregion // Public Constructors
+ #region Public Methods
+#if NET_2_0
+ public void ShowBalloonTip (int timeout)
+ {
+ ShowBalloonTip(timeout, balloon_title, balloon_text,
balloon_icon);
+ }
+
+ public void ShowBalloonTip(int timeout, string tipTitle, string
tipText, ToolTipIcon tipIcon)
+ {
+ // TODO: Call ShowBalloonTip in XplatUI.
+ }
+#endif
+ #endregion Public Methods
+
#region Private Methods
private void OnClick (EventArgs e)
{
@@ -316,6 +338,40 @@
#endregion // Private Methods
#region Public Instance Properties
+#if NET_2_0
+ public ToolTipIcon BalloonTipIcon {
+ get { return this.balloon_icon; }
+ set {
+ if (value == this.balloon_icon)
+ return;
+
+ this.balloon_icon = value;
+ }
+ }
+
+ [Localizable(true)]
+ public string BalloonTipText {
+ get { return this.balloon_text; }
+ set {
+ if (value == this.balloon_text)
+ return;
+
+ this.balloon_text = value;
+ }
+ }
+
+ [Localizable(true)]
+ public string BalloonTipTitle {
+ get { return this.balloon_title; }
+ set {
+ if (value == this.balloon_title)
+ return;
+
+ this.balloon_title = value;
+ }
+ }
+#endif
+
[DefaultValue(null)]
#if NET_2_0
[Browsable (false)]
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUI.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUI.cs
2007-03-26 04:11:05 UTC (rev 74967)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUI.cs
2007-03-26 09:08:02 UTC (rev 74968)
@@ -654,6 +654,15 @@
driver.MenuToScreen(handle, ref x, ref y);
}
+#if NET_2_0
+ internal static void ShowBalloonTip(int timeout, string
tipTitle, string tipText, ToolTipIcon tipIcon) {
+ #if DriverDebug
+ Console.WriteLine("ShowBalloonTip ({0}, {1},
{2}, {3}): Called", timeout, tipTitle, tipText, tipIcon);
+ #endif
+ driver.ShowBalloonTip(timeout, tipTitle, tipText,
tipIcon);
+ }
+#endif
+
internal static void OverrideCursor(IntPtr cursor) {
#if DriverDebug
Console.WriteLine("OverrideCursor({0:X}):
Called", cursor.ToInt32());
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIDriver.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIDriver.cs
2007-03-26 04:11:05 UTC (rev 74967)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIDriver.cs
2007-03-26 09:08:02 UTC (rev 74968)
@@ -265,6 +265,10 @@
internal abstract void MenuToScreen(IntPtr hwnd, ref int x, ref
int y);
internal abstract void ScreenToMenu(IntPtr hwnd, ref int x, ref
int y);
+#if NET_2_0
+ internal abstract void ShowBalloonTip(int timeout, string
tipTitle, string tipText, ToolTipIcon tipIcon);
+#endif
+
internal abstract void SetIcon(IntPtr handle, Icon icon);
internal abstract void ClipboardClose(IntPtr handle);
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIOSX.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIOSX.cs
2007-03-26 04:11:05 UTC (rev 74967)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIOSX.cs
2007-03-26 09:08:02 UTC (rev 74968)
@@ -1341,7 +1341,15 @@
y = (int)(pt.y+wBounds.top);
}
+#if NET_2_0
[MonoTODO]
+ internal override void ShowBalloonTip(int timeout, string
tipTitle, string tipText, ToolTipIcon tipIcon)
+ {
+ throw new NotImplementedException ();
+ }
+#endif
+
+ [MonoTODO]
internal override void OverrideCursor(IntPtr cursor) {
throw new NotImplementedException ();
}
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs
2007-03-26 04:11:05 UTC (rev 74967)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs
2007-03-26 09:08:02 UTC (rev 74968)
@@ -2092,6 +2092,13 @@
return;
}
+ #if NET_2_0
+ internal override void ShowBalloonTip(int timeout, string
tipTitle, string tipText, ToolTipIcon tipIcon)
+ {
+ // TODO:
+ }
+#endif
+
internal override void SendAsyncMethod (AsyncMethodData method)
{
Win32PostMessage(FosterParent, Msg.WM_ASYNC_MESSAGE,
IntPtr.Zero, (IntPtr)GCHandle.Alloc (method));
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
2007-03-26 04:11:05 UTC (rev 74967)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
2007-03-26 09:08:02 UTC (rev 74968)
@@ -4309,6 +4309,13 @@
y = dest_y_return;
}
+#if NET_2_0
+ internal override void ShowBalloonTip(int timeout, string
tipTitle, string tipText, ToolTipIcon tipIcon)
+ {
+ // TODO:
+ }
+#endif
+
internal override void OverrideCursor(IntPtr cursor)
{
if (Grab.Hwnd != IntPtr.Zero) {
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/XplatUIX11-new.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/XplatUIX11-new.cs
2007-03-26 04:11:05 UTC (rev 74967)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/XplatUIX11-new.cs
2007-03-26 09:08:02 UTC (rev 74968)
@@ -673,6 +673,13 @@
hwnd.MenuToScreen (ref x, ref y);
}
+#if NET_2_0
+ internal override void ShowBalloonTip(int timeout, string
tipTitle, string tipText, ToolTipIcon tipIcon)
+ {
+ // TODO:
+ }
+#endif
+
internal override void OverrideCursor (IntPtr cursor)
{
display.OverrideCursor = cursor;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
