Browse Source

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
shortcuts
Daniel Grunwald 19 years ago
parent
commit
27c4022855
  1. 30
      src/Libraries/DockPanel_Src/WinFormsUI/Docking/AutoHideStripBase.cs
  2. 20
      src/Libraries/DockPanel_Src/WinFormsUI/Docking/DockPaneStripBase.cs
  3. 14
      src/Libraries/DockPanel_Src/patchnotes.txt

30
src/Libraries/DockPanel_Src/WinFormsUI/Docking/AutoHideStripBase.cs

@ -20,23 +20,12 @@ namespace WeifenLuo.WinFormsUI.Docking
m_content = content; m_content = content;
} }
~Tab()
{
Dispose(false);
}
public IDockContent Content public IDockContent Content
{ {
get { return m_content; } get { return m_content; }
} }
public void Dispose() public virtual void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
protected virtual void Dispose(bool disposing)
{ {
} }
} }
@ -126,11 +115,6 @@ namespace WeifenLuo.WinFormsUI.Docking
m_dockPane = dockPane; m_dockPane = dockPane;
} }
~Pane()
{
Dispose(false);
}
public DockPane DockPane public DockPane DockPane
{ {
get { return m_dockPane; } get { return m_dockPane; }
@ -145,14 +129,8 @@ namespace WeifenLuo.WinFormsUI.Docking
return DockPane.AutoHideTabs as TabCollection; return DockPane.AutoHideTabs as TabCollection;
} }
} }
public void Dispose() public virtual void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
protected virtual void Dispose(bool disposing)
{ {
} }
} }

20
src/Libraries/DockPanel_Src/WinFormsUI/Docking/DockPaneStripBase.cs

@ -21,11 +21,6 @@ namespace WeifenLuo.WinFormsUI.Docking
m_content = content; m_content = content;
} }
~Tab()
{
Dispose(false);
}
public IDockContent Content public IDockContent Content
{ {
get { return m_content; } get { return m_content; }
@ -36,13 +31,7 @@ namespace WeifenLuo.WinFormsUI.Docking
get { return m_content as Form; } get { return m_content as Form; }
} }
public void Dispose() public virtual void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
protected virtual void Dispose(bool disposing)
{ {
} }
} }
@ -226,6 +215,13 @@ namespace WeifenLuo.WinFormsUI.Docking
content.DockHandler.IsFloat = !content.DockHandler.IsFloat; 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; return;
} }

14
src/Libraries/DockPanel_Src/patchnotes.txt

@ -4,14 +4,6 @@ Patch #0:
Add bool IsDisposed { get; } to IDockContent interface. Add bool IsDisposed { get; } to IDockContent interface.
Patch #1: Patch #1:
Close documents with middle click - in DockPaneTabStripBase.cs Close documents with middle click - in DockPaneStripBase.cs
Remove redundant finalizers - in AutoHidePane.cs and AutoHideTab.cs Remove redundant finalizers - in AutoHideStripBase.cs, DockPaneStripBase.cs
Remove redundant P/Invoke call - in AutoHideStripBase.cs Committed in revision 2473.
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.

Loading…
Cancel
Save