From 27c4022855607083bb5855d03bad7697ed660c35 Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Thu, 5 Apr 2007 16:12:25 +0000
Subject: [PATCH] Apply our patches to the docking library; remove patches that
 are not required anymore from patchnotes.txt

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2473 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
---
 .../WinFormsUI/Docking/AutoHideStripBase.cs   | 30 +++----------------
 .../WinFormsUI/Docking/DockPaneStripBase.cs   | 20 +++++--------
 src/Libraries/DockPanel_Src/patchnotes.txt    | 14 ++-------
 3 files changed, 15 insertions(+), 49 deletions(-)

diff --git a/src/Libraries/DockPanel_Src/WinFormsUI/Docking/AutoHideStripBase.cs b/src/Libraries/DockPanel_Src/WinFormsUI/Docking/AutoHideStripBase.cs
index fbd9b13c19..44c30e7e4a 100644
--- a/src/Libraries/DockPanel_Src/WinFormsUI/Docking/AutoHideStripBase.cs
+++ b/src/Libraries/DockPanel_Src/WinFormsUI/Docking/AutoHideStripBase.cs
@@ -20,23 +20,12 @@ namespace WeifenLuo.WinFormsUI.Docking
                 m_content = content;
             }
 
-            ~Tab()
-            {
-                Dispose(false);
-            }
-
             public IDockContent Content
             {
                 get { return m_content; }
             }
-
-            public void Dispose()
-            {
-                Dispose(true);
-                GC.SuppressFinalize(this);
-            }
-
-            protected virtual void Dispose(bool disposing)
+            
+            public virtual void Dispose()
             {
             }
         }
@@ -126,11 +115,6 @@ namespace WeifenLuo.WinFormsUI.Docking
                 m_dockPane = dockPane;
             }
 
-            ~Pane()
-            {
-                Dispose(false);
-            }
-
             public DockPane DockPane
             {
                 get { return m_dockPane; }
@@ -145,14 +129,8 @@ namespace WeifenLuo.WinFormsUI.Docking
                     return DockPane.AutoHideTabs as TabCollection;
                 }
             }
-
-            public void Dispose()
-            {
-                Dispose(true);
-                GC.SuppressFinalize(this);
-            }
-
-            protected virtual void Dispose(bool disposing)
+            
+            public virtual void Dispose()
             {
             }
         }
diff --git a/src/Libraries/DockPanel_Src/WinFormsUI/Docking/DockPaneStripBase.cs b/src/Libraries/DockPanel_Src/WinFormsUI/Docking/DockPaneStripBase.cs
index ea29ecebc3..47e6a0826a 100644
--- a/src/Libraries/DockPanel_Src/WinFormsUI/Docking/DockPaneStripBase.cs
+++ b/src/Libraries/DockPanel_Src/WinFormsUI/Docking/DockPaneStripBase.cs
@@ -21,11 +21,6 @@ namespace WeifenLuo.WinFormsUI.Docking
                 m_content = content;
             }
 
-            ~Tab()
-            {
-                Dispose(false);
-            }
-
             public IDockContent Content
             {
                 get { return m_content; }
@@ -36,13 +31,7 @@ namespace WeifenLuo.WinFormsUI.Docking
                 get { return m_content as Form; }
             }
 
-            public void Dispose()
-            {
-                Dispose(true);
-                GC.SuppressFinalize(this);
-            }
-
-            protected virtual void Dispose(bool disposing)
+            public virtual void Dispose()
             {
             }
         }
@@ -226,6 +215,13 @@ namespace WeifenLuo.WinFormsUI.Docking
 					    content.DockHandler.IsFloat = !content.DockHandler.IsFloat;	
 				}
 
+				return;
+			} else if (m.Msg == (int)Win32.Msgs.WM_MBUTTONUP) {
+				base.WndProc(ref m);
+				int index = HitTest();
+				if (index != -1) {
+					DockPane.CloseContent(Tabs[index].Content);
+				}
 				return;
 			}
 
diff --git a/src/Libraries/DockPanel_Src/patchnotes.txt b/src/Libraries/DockPanel_Src/patchnotes.txt
index 1f894535bd..ed242306a0 100644
--- a/src/Libraries/DockPanel_Src/patchnotes.txt
+++ b/src/Libraries/DockPanel_Src/patchnotes.txt
@@ -4,14 +4,6 @@ Patch #0:
        Add bool IsDisposed { get; } to IDockContent interface.
 
 Patch #1:
-	Close documents with middle click     - in DockPaneTabStripBase.cs
-	Remove redundant finalizers           - in AutoHidePane.cs and AutoHideTab.cs
-	Remove redundant P/Invoke call        - in AutoHideStripBase.cs
-	Fix compilation warning               - in InertButton.cs
- Committed in revision 1147.
-
-Patch #2:
-	Activate the autohide pad explicitly  - in DockContentHandler.cs
-	(DockContentHandler.Activate())  
- Committed in revision 1840.
-
+	Close documents with middle click     - in DockPaneStripBase.cs
+	Remove redundant finalizers           - in AutoHideStripBase.cs, DockPaneStripBase.cs
+ Committed in revision 2473.