[Monodevelop-patches-list] r2459 - in trunk/MonoDevelop: . Core/src/MonoDevelop.Dock
John Luke <jluke@cfl.rr.com>
jluke at mono-cvs.ximian.com
Sat Apr 16 18:53:19 EDT 2005
Author: jluke
Date: 2005-04-16 18:53:18 -0400 (Sat, 16 Apr 2005)
New Revision: 2459
Modified:
trunk/MonoDevelop/ChangeLog
trunk/MonoDevelop/Core/src/MonoDevelop.Dock/ChangeLog
trunk/MonoDevelop/Core/src/MonoDevelop.Dock/Dock.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockItem.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockItemGrip.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockMaster.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockNotebook.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockPaned.cs
trunk/MonoDevelop/configure.in
Log:
use new ForAll stuff in the dock
Modified: trunk/MonoDevelop/ChangeLog
===================================================================
--- trunk/MonoDevelop/ChangeLog 2005-04-15 16:43:43 UTC (rev 2458)
+++ trunk/MonoDevelop/ChangeLog 2005-04-16 22:53:18 UTC (rev 2459)
@@ -1,3 +1,7 @@
+2005-04-16 John Luke <john.luke at gmail.com>
+
+ * configure.in: bump gtk# dep to 1.9.3 for latest dock changes
+
2005-04-14 Raja R Harinath <rharinath at novell.com>
* contrib/Makefile.am (log4net.dll): Copy from $(srcdir).
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Dock/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Dock/ChangeLog 2005-04-15 16:43:43 UTC (rev 2458)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Dock/ChangeLog 2005-04-16 22:53:18 UTC (rev 2459)
@@ -1,3 +1,12 @@
+2005-04-16 John Luke <john.luke at gmail.com>
+
+ * DockItem.cs:
+ * Dock.cs:
+ * DockItemGrip.cs:
+ * DockNotebook.cs:
+ * DockPaned.cs: use ForAll overload that takes a Callback
+ * DockMaster.cs: remove unused field
+
2005-04-06 John Luke <john.luke at gmail.com>
* MonoDevelop.Dock.mdp:
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Dock/Dock.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Dock/Dock.cs 2005-04-15 16:43:43 UTC (rev 2458)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Dock/Dock.cs 2005-04-16 22:53:18 UTC (rev 2459)
@@ -311,10 +311,10 @@
}
}
- protected override void ForAll (bool include_internals, CallbackInvoker invoker)
+ protected override void ForAll (bool include_internals, Callback cb)
{
if (root != null)
- invoker.Invoke (root);
+ cb (root);
}
public override void OnDetached (bool recursive)
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockItem.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockItem.cs 2005-04-15 16:43:43 UTC (rev 2458)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockItem.cs 2005-04-16 22:53:18 UTC (rev 2459)
@@ -44,7 +44,6 @@
private DockItemGrip grip;
private DockBar dockBar;
private DockBarButton dockButton;
- private uint gripSize;
private Widget tabLabel = null;
private int preferredWidth = -1;
private int preferredHeight = -1;
@@ -285,12 +284,12 @@
QueueResize ();
}
- protected override void ForAll (bool include_internals, CallbackInvoker invoker)
+ protected override void ForAll (bool include_internals, Callback cb)
{
if (include_internals && grip != null)
- invoker.Invoke (grip);
+ cb (grip);
if (Child != null)
- invoker.Invoke (Child);
+ cb (Child);
}
protected override void OnSizeRequested (ref Requisition requisition)
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockItemGrip.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockItemGrip.cs 2005-04-15 16:43:43 UTC (rev 2458)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockItemGrip.cs 2005-04-16 22:53:18 UTC (rev 2459)
@@ -490,11 +490,11 @@
Console.WriteLine ("You can't remove a widget from DockItemGrip directly");
}
- protected override void ForAll (bool include_internals, CallbackInvoker invoker)
+ protected override void ForAll (bool include_internals, Callback cb)
{
if (include_internals) {
- invoker.Invoke (closeButton);
- invoker.Invoke (iconifyButton);
+ cb (closeButton);
+ cb (iconifyButton);
}
}
}
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockMaster.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockMaster.cs 2005-04-15 16:43:43 UTC (rev 2458)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockMaster.cs 2005-04-16 22:53:18 UTC (rev 2459)
@@ -29,7 +29,6 @@
{
public class DockMaster
{
- private object obj;
private Hashtable dockObjects = new Hashtable ();
private ArrayList toplevelDocks = new ArrayList ();
private DockObject controller = null;
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockNotebook.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockNotebook.cs 2005-04-15 16:43:43 UTC (rev 2458)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockNotebook.cs 2005-04-16 22:53:18 UTC (rev 2459)
@@ -43,7 +43,6 @@
}
private DockInfo dockInfo;
- private CallbackInvoker storedInvoker;
protected DockNotebook (IntPtr raw) : base (raw) { }
@@ -96,23 +95,17 @@
Dock ((DockObject)widget, DockPlacement.Center, null);
}
- protected override void ForAll (bool includeInternals, CallbackInvoker invoker)
+ protected override void ForAll (bool includeInternals, Callback cb)
{
if (includeInternals) {
- base.ForAll (includeInternals, invoker);
+ base.ForAll (includeInternals, cb);
} else {
if (Child != null) {
- storedInvoker = invoker;
- ((Notebook)Child).Foreach (new Callback (ChildForAll));
+ ((Notebook)Child).Foreach (cb);
}
}
}
-
- private void ChildForAll (Widget widget)
- {
- storedInvoker.Invoke (widget);
- }
-
+
private void DockChild (Widget w)
{
if (w is DockObject)
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockPaned.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockPaned.cs 2005-04-15 16:43:43 UTC (rev 2458)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockPaned.cs 2005-04-16 22:53:18 UTC (rev 2459)
@@ -112,11 +112,6 @@
Dock (item, pos, null);
}
- private void childForAll (Widget widget)
- {
- stored_invoker.Invoke (widget);
- }
-
public override bool OnChildPlacement (DockObject child, ref DockPlacement placement)
{
DockPlacement pos = DockPlacement.None;
@@ -149,15 +144,13 @@
}
}
- private CallbackInvoker stored_invoker;
- protected override void ForAll (bool include_internals, CallbackInvoker invoker)
+ protected override void ForAll (bool include_internals, Callback cb)
{
if (include_internals) {
- base.ForAll (include_internals, invoker);
+ base.ForAll (include_internals, cb);
} else {
if (Child != null) {
- stored_invoker = invoker;
- ((Paned)Child).Foreach (new Callback (childForAll));
+ ((Paned)Child).Foreach (cb);
}
}
}
Modified: trunk/MonoDevelop/configure.in
===================================================================
--- trunk/MonoDevelop/configure.in 2005-04-15 16:43:43 UTC (rev 2458)
+++ trunk/MonoDevelop/configure.in 2005-04-16 22:53:18 UTC (rev 2459)
@@ -64,7 +64,7 @@
dnl hard dependencies
-GTKSHARP_REQUIRED_VERSION=1.9.2
+GTKSHARP_REQUIRED_VERSION=1.9.3
GTKSOURCEVIEWSHARP_REQUIRED_VERSION=0.7
GECKOSHARP_REQUIRED_VERSION=0.7
MONODOC_REQUIRED_VERSION=1.0
More information about the Monodevelop-patches-list
mailing list