Browse Source

Fixed invalid cast exception when creating tool strip items due to the ToolbarItemDoozer now returning a ToolbarItemDescriptor.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@3304 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Matt Ward 18 years ago
parent
commit
06cd155507
  1. 15
      src/AddIns/Misc/CodeCoverage/Project/Src/ShowDisplayOptionsDropDown.cs
  2. 9
      src/Main/Base/Project/Src/Gui/Pads/ClassBrowser/ClassBrowserToolbarCommands.cs

15
src/AddIns/Misc/CodeCoverage/Project/Src/ShowDisplayOptionsDropDown.cs

@ -24,18 +24,7 @@ namespace ICSharpCode.CodeCoverage
{ {
base.OnOwnerChanged(e); base.OnOwnerChanged(e);
dropDownButton = (ToolBarDropDownButton)Owner; dropDownButton = (ToolBarDropDownButton)Owner;
GenerateDropDownItems(); MenuService.AddItemsToMenu(dropDownButton.DropDownItems, this, "/SharpDevelop/Pads/CodeCoveragePad/Toolbar/CodeCoveragePadDisplayOptions");
} }
void GenerateDropDownItems()
{
ToolStripItem[] items = (ToolStripItem[])(AddInTree.GetTreeNode("/SharpDevelop/Pads/CodeCoveragePad/Toolbar/CodeCoveragePadDisplayOptions").BuildChildItems(this)).ToArray(typeof(ToolStripItem));
foreach (ToolStripItem item in items) {
if (item is IStatusUpdate) {
((IStatusUpdate)item).UpdateStatus();
}
}
dropDownButton.DropDownItems.AddRange(items);
}
} }
} }

9
src/Main/Base/Project/Src/Gui/Pads/ClassBrowser/ClassBrowserToolbarCommands.cs

@ -51,14 +51,7 @@ namespace ICSharpCode.SharpDevelop.Gui.ClassBrowser
{ {
base.OnOwnerChanged(e); base.OnOwnerChanged(e);
dropDownButton = (ToolBarDropDownButton)Owner; dropDownButton = (ToolBarDropDownButton)Owner;
ToolStripItem[] items = (ToolStripItem[])(AddInTree.GetTreeNode("/SharpDevelop/Pads/ClassBrowser/Toolbar/SelectFilter").BuildChildItems(this)).ToArray(typeof(ToolStripItem)); MenuService.AddItemsToMenu(dropDownButton.DropDownItems, this, "/SharpDevelop/Pads/ClassBrowser/Toolbar/SelectFilter");
foreach (ToolStripItem item in items) {
if (item is IStatusUpdate) {
((IStatusUpdate)item).UpdateStatus();
}
}
dropDownButton.DropDownItems.AddRange(items);
} }
} }

Loading…
Cancel
Save