2007-08-17 Jonathan Pobst <monkey@jpobst.com>

	* ToolBar.cs, ToolStrip.cs, TreeView.cs: Use a ToolTip instead of a
	ToolTipWindow.
	* ToolTip.cs: Add an internal Visible property to facilitate transition.

svn path=/trunk/mcs/; revision=84307

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 6bc6e655366241f7694bb6f5af3a55eb7904ef70..5cad069f76e471b1e7296e3b2c742745cd8140c0 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-17  Jonathan Pobst  <monkey@jpobst.com>
+
+       * ToolBar.cs, ToolStrip.cs, TreeView.cs: Use a ToolTip instead of a
+       ToolTipWindow.
+       * ToolTip.cs: Add an internal Visible property to facilitate transition.
+
 2007-08-17  Jonathan Pobst  <monkey@jpobst.com>
 
        * DrawToolTipEventArgs.cs, DrawToolTipEventHandler.cs, PopupEventArgs.cs,

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
index 3e82c5a4588cfdce13d2cf7250c478ad8fe3ad1d..689cd28f975762d0740e8d2c26168dd53a40b0d6 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
@@ -709,7 +709,7 @@ namespace System.Windows.Forms
                        // Hide tooltip when left mouse button 
                        if ((tip_window != null) && (tip_window.Visible) && ((me.Button & MouseButtons.Left) == MouseButtons.Left)) {
                                TipDownTimer.Stop ();
-                               tip_window.Hide ();
+                               tip_window.Hide (this);
                        }
                        
                        // draw the pushed button
@@ -783,12 +783,12 @@ namespace System.Windows.Forms
                        return null;
                }
 
-               ToolTip.ToolTipWindow tip_window = null;
+               ToolTip tip_window = null;
                Timer tipdown_timer = null;
 
                private void PopDownTip (object o, EventArgs args)
                {
-                       tip_window.Hide ();
+                       tip_window.Hide (this);
                }
 
                private Timer TipDownTimer {
@@ -809,7 +809,7 @@ namespace System.Windows.Forms
                                return;
 
                        if (tip_window == null)
-                               tip_window = new ToolTip.ToolTipWindow ();
+                               tip_window = new ToolTip ();
 
                        ToolBarItem item = ItemAtPoint (PointToClient (Control.MousePosition));
                        current_item = item;
@@ -872,7 +872,7 @@ namespace System.Windows.Forms
                        } else {
                                if (tip_window != null) {
                                        if (tip_window.Visible) {
-                                               tip_window.Hide ();
+                                               tip_window.Hide (this);
                                                TipDownTimer.Stop ();
                                        }
                                        current_item = ItemAtPoint (loc);

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs
index 1277b557c6db146e243c198ca04a23b37c45869f..fce31b57827c519f9639732dcaa6bcd02a6b0ff9 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs
@@ -72,7 +72,7 @@ namespace System.Windows.Forms
                private ToolStripRenderMode render_mode;
                private ToolStripTextDirection text_direction;
                private Timer tooltip_timer;
-               private ToolTip.ToolTipWindow tooltip_window;
+               private ToolTip tooltip_window;
                private bool show_item_tool_tips;
                private bool stretch;
 
@@ -1524,7 +1524,7 @@ namespace System.Windows.Forms
                private void MouseLeftItem (ToolStripItem item)
                {
                        ToolTipTimer.Stop ();
-                       ToolTipWindow.Hide ();
+                       ToolTipWindow.Hide (this);
                        tooltip_currently_showing = null;
                }
                
@@ -1541,10 +1541,10 @@ namespace System.Windows.Forms
                        }
                }
                
-               private ToolTip.ToolTipWindow ToolTipWindow {
+               private ToolTip ToolTipWindow {
                        get {
                                if (tooltip_window == null)
-                                       tooltip_window = new ToolTip.ToolTipWindow ();
+                                       tooltip_window = new ToolTip ();
                                        
                                return tooltip_window;
                        }

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolTip.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolTip.cs
index 8c34e9ddc8a9028e7c615558a42ed455fcd5ee83..a4815bc811a76460c16d201a25eb8497a610a75a 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolTip.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolTip.cs
@@ -889,6 +889,10 @@ namespace System.Windows.Forms {
                        if (eh != null)
                                eh (this, e);
                }
+               
+               internal bool Visible {
+                       get { return tooltip_window.Visible; }
+               }
                #endregion      // Private Methods
 
                #region Events

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
index 3ba05891a9f9762ce7dde2a3413fa40cf45035a8..63396ef465082d147eef4dc08dca6a3095ddd5b3 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
@@ -70,7 +70,7 @@ namespace System.Windows.Forms {
                private bool show_node_tool_tips;
                private ImageList state_image_list;
                private TreeNode tooltip_currently_showing;
-               private ToolTip.ToolTipWindow tooltip_window;
+               private ToolTip tooltip_window;
 #endif
                private bool full_row_select;
                private bool hot_tracking;
@@ -2251,14 +2251,14 @@ namespace System.Windows.Forms {
 
                private void MouseLeftItem (TreeNode item)
                {
-                       ToolTipWindow.Hide ();
+                       ToolTipWindow.Hide (this);
                        tooltip_currently_showing = null;
                }
 
-               private ToolTip.ToolTipWindow ToolTipWindow {
+               private ToolTip ToolTipWindow {
                        get {
                                if (tooltip_window == null)
-                                       tooltip_window = new ToolTip.ToolTipWindow ();
+                                       tooltip_window = new ToolTip ();
 
                                return tooltip_window;
                        }