diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonConsolePad.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonConsolePad.cs index 221cae2b9b..e22eba8158 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonConsolePad.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonConsolePad.cs @@ -29,7 +29,7 @@ namespace ICSharpCode.PythonBinding host.Run(); } - public override object Content { + public override object Control { get { return textEditorControl; } } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockProject.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockProject.cs index 3c40b25205..55ecf59fd4 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockProject.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockProject.cs @@ -310,6 +310,11 @@ namespace PythonBinding.Tests.Utils { throw new NotImplementedException(); } + + public ProjectBuildOptions CreateProjectBuildOptions(BuildOptions options, bool isRootBuildable) + { + throw new NotImplementedException(); + } #endregion } } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockViewContent.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockViewContent.cs index c06c51a07a..f33b214897 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockViewContent.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockViewContent.cs @@ -55,7 +55,7 @@ namespace PythonBinding.Tests.Utils get { return secondaryViewContents; } } - public object Content { + public object Control { get { throw new NotImplementedException(); } diff --git a/src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/PackageFilesView.cs b/src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/PackageFilesView.cs index 83f371669d..664993b9f2 100644 --- a/src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/PackageFilesView.cs +++ b/src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/PackageFilesView.cs @@ -31,7 +31,7 @@ namespace ICSharpCode.WixBinding WixProject project; bool reload; - public override object Content { + public override object Control { get { return packageFilesControl; } diff --git a/src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/SetupDialogListPad.cs b/src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/SetupDialogListPad.cs index bee47ccfcc..9e026deabe 100644 --- a/src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/SetupDialogListPad.cs +++ b/src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/SetupDialogListPad.cs @@ -45,7 +45,7 @@ namespace ICSharpCode.WixBinding } } - public override object Content { + public override object Control { get { return setupDialogListView; } diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/AvalonEditViewContent.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/AvalonEditViewContent.cs index a72ccb689d..1481972df0 100644 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/AvalonEditViewContent.cs +++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/AvalonEditViewContent.cs @@ -43,7 +43,7 @@ namespace ICSharpCode.AvalonEdit.AddIn get { return codeEditor; } } - public override object Content { + public override object Control { get { return codeEditor; } } diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramCommand.cs b/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramCommand.cs index 7d9cc133ec..2012feaa71 100644 --- a/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramCommand.cs +++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramCommand.cs @@ -18,7 +18,7 @@ namespace ClassDiagramAddin { protected ClassCanvas Canvas { - get { return (ClassCanvas)((ClassDiagramViewContent)this.Owner).Content; } + get { return (ClassCanvas)((ClassDiagramViewContent)this.Owner).Control; } } } diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramViewContent.cs b/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramViewContent.cs index 884342e53b..578d66b23e 100644 --- a/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramViewContent.cs +++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramViewContent.cs @@ -43,7 +43,7 @@ namespace ClassDiagramAddin canvas.ContextMenuStrip = MenuService.CreateContextMenu(this, "/SharpDevelop/ViewContent/ClassDiagram/ContextMenu"); } - public override object Content { + public override object Control { get { return canvas; } } diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs index 3c65836705..267f6f73eb 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs @@ -520,7 +520,7 @@ namespace ICSharpCode.FormsDesigner designView.RightToLeft = RightToLeft.No; // Make sure auto-scaling is based on the correct font. // This is required on Vista, I don't know why it works correctly in XP - designView.Font = Control.DefaultFont; + designView.Font = System.Windows.Forms.Control.DefaultFont; this.UserContent = designView; LoggingService.Debug("FormsDesigner loaded, setting ActiveDesignSurface to " + this.designSurface.ToString()); diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/FormKeyHandler.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/FormKeyHandler.cs index 6a400b6f76..57ef3b0645 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/FormKeyHandler.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/FormKeyHandler.cs @@ -75,7 +75,7 @@ namespace ICSharpCode.FormsDesigner if (formDesigner == null || formDesigner.Host == null) { return false; } - if (!((Control)formDesigner.Content).ContainsFocus) + if (!((Control)formDesigner.Control).ContainsFocus) return false; Keys keyPressed = (Keys)m.WParam.ToInt32() | Control.ModifierKeys; diff --git a/src/AddIns/DisplayBindings/HexEditor/Project/Src/View/HexEditView.cs b/src/AddIns/DisplayBindings/HexEditor/Project/Src/View/HexEditView.cs index 96deff7979..2272edc7db 100644 --- a/src/AddIns/DisplayBindings/HexEditor/Project/Src/View/HexEditView.cs +++ b/src/AddIns/DisplayBindings/HexEditor/Project/Src/View/HexEditView.cs @@ -28,7 +28,7 @@ namespace HexEditor.View file.ForceInitializeView(this); } - public override object Content { + public override object Control { get { return hexEditContainer; } } diff --git a/src/AddIns/DisplayBindings/IconEditor/IconEditorAddIn/Src/IconViewContent.cs b/src/AddIns/DisplayBindings/IconEditor/IconEditorAddIn/Src/IconViewContent.cs index 4dcbee55a8..dd0fb4db5c 100644 --- a/src/AddIns/DisplayBindings/IconEditor/IconEditorAddIn/Src/IconViewContent.cs +++ b/src/AddIns/DisplayBindings/IconEditor/IconEditorAddIn/Src/IconViewContent.cs @@ -19,7 +19,7 @@ namespace ICSharpCode.IconEditorAddIn { EditorPanel editor = new EditorPanel(); - public override object Content { + public override object Control { get { return editor; } diff --git a/src/AddIns/DisplayBindings/SettingsEditor/Project/SettingsViewContent.cs b/src/AddIns/DisplayBindings/SettingsEditor/Project/SettingsViewContent.cs index 86f15e0353..ddf4b1f6b7 100644 --- a/src/AddIns/DisplayBindings/SettingsEditor/Project/SettingsViewContent.cs +++ b/src/AddIns/DisplayBindings/SettingsEditor/Project/SettingsViewContent.cs @@ -36,7 +36,7 @@ namespace ICSharpCode.SettingsEditor }; } - public override object Content { + public override object Control { get { return view; } diff --git a/src/AddIns/DisplayBindings/WorkflowDesigner/Project/Src/PrimaryView/PrimaryViewContent.cs b/src/AddIns/DisplayBindings/WorkflowDesigner/Project/Src/PrimaryView/PrimaryViewContent.cs index 074ca33daa..d1fb1e457d 100644 --- a/src/AddIns/DisplayBindings/WorkflowDesigner/Project/Src/PrimaryView/PrimaryViewContent.cs +++ b/src/AddIns/DisplayBindings/WorkflowDesigner/Project/Src/PrimaryView/PrimaryViewContent.cs @@ -37,7 +37,7 @@ namespace WorkflowDesigner } - public override object Content { + public override object Control { get { return control; } diff --git a/src/AddIns/DisplayBindings/WorkflowDesigner/Project/Src/SecondaryView/SecondaryViewContent.cs b/src/AddIns/DisplayBindings/WorkflowDesigner/Project/Src/SecondaryView/SecondaryViewContent.cs index bbe55af222..d8bca87a61 100644 --- a/src/AddIns/DisplayBindings/WorkflowDesigner/Project/Src/SecondaryView/SecondaryViewContent.cs +++ b/src/AddIns/DisplayBindings/WorkflowDesigner/Project/Src/SecondaryView/SecondaryViewContent.cs @@ -34,7 +34,7 @@ namespace WorkflowDesigner #endregion #region Property Accessors - public override object Content { + public override object Control { get { return control; } diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XPathQueryPad.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XPathQueryPad.cs index 7468df1668..3f2e0b6d13 100644 --- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XPathQueryPad.cs +++ b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XPathQueryPad.cs @@ -38,7 +38,7 @@ namespace ICSharpCode.XmlEditor /// /// The representing the pad. /// - public override object Content { + public override object Control { get { return xPathQueryControl; } diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlTreeView.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlTreeView.cs index 3d5fa0a32f..91becadf85 100644 --- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlTreeView.cs +++ b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlTreeView.cs @@ -44,7 +44,7 @@ namespace ICSharpCode.XmlEditor treeViewContainer.TreeView.ContextMenuStrip = treeViewContextMenuStrip; } - public override object Content { + public override object Control { get { return treeViewContainer; } diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlView.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlView.cs index 15a0a3be70..1d21d9c50a 100644 --- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlView.cs +++ b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlView.cs @@ -549,7 +549,7 @@ namespace ICSharpCode.XmlEditor #region AbstractViewContent implementation - public override object Content { + public override object Control { get { return xmlEditor; } diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlTreeViewClipboardHandlerTestFixture.cs b/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlTreeViewClipboardHandlerTestFixture.cs index 197f52be4e..77ea7b3a32 100644 --- a/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlTreeViewClipboardHandlerTestFixture.cs +++ b/src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlTreeViewClipboardHandlerTestFixture.cs @@ -40,7 +40,7 @@ namespace XmlEditor.Tests.Tree xmlView = new XmlView(new DefaultTextEditorProperties(), schemas); xmlView.SetPrimaryFileUnitTestMode(openedFile); view = new XmlTreeView(xmlView, null, null); - treeViewContainer = (XmlTreeViewContainerControl)view.Content; + treeViewContainer = (XmlTreeViewContainerControl)view.Control; treeView = treeViewContainer.TreeView; clipboardHandler = view as IClipboardHandler; diff --git a/src/AddIns/Misc/AddinScout/Project/Src/AddInScoutViewContent.cs b/src/AddIns/Misc/AddinScout/Project/Src/AddInScoutViewContent.cs index 2e860f4ce9..85ef26c731 100644 --- a/src/AddIns/Misc/AddinScout/Project/Src/AddInScoutViewContent.cs +++ b/src/AddIns/Misc/AddinScout/Project/Src/AddInScoutViewContent.cs @@ -16,7 +16,7 @@ namespace AddInScout { Control control = null; - public override object Content { + public override object Control { get { return control; } diff --git a/src/AddIns/Misc/CodeCoverage/Project/Src/CodeCoveragePad.cs b/src/AddIns/Misc/CodeCoverage/Project/Src/CodeCoveragePad.cs index b12882941a..017f04821d 100644 --- a/src/AddIns/Misc/CodeCoverage/Project/Src/CodeCoveragePad.cs +++ b/src/AddIns/Misc/CodeCoverage/Project/Src/CodeCoveragePad.cs @@ -38,7 +38,7 @@ namespace ICSharpCode.CodeCoverage } } - public override object Content { + public override object Control { get { return codeCoverageControl; } diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Src/ComponentInspectorView.cs b/src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Src/ComponentInspectorView.cs index 47a4c171c9..09ccebb918 100644 --- a/src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Src/ComponentInspectorView.cs +++ b/src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Src/ComponentInspectorView.cs @@ -45,7 +45,7 @@ namespace ICSharpCode.ComponentInspector.AddIn } } - public override object Content { + public override object Control { get { return objectBrowser; } diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/CallStackPad.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/CallStackPad.cs index c6fc602e99..48eee78817 100644 --- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/CallStackPad.cs +++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/CallStackPad.cs @@ -58,7 +58,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads ColumnHeader name = new ColumnHeader(); ColumnHeader language = new ColumnHeader(); - public override object Content { + public override object Control { get { return callStackList; } diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LoadedModulesPad.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LoadedModulesPad.cs index 9be2823f42..ea5bceb6a5 100644 --- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LoadedModulesPad.cs +++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LoadedModulesPad.cs @@ -59,7 +59,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads ColumnHeader information = new ColumnHeader(); - public override object Content { + public override object Control { get { return loadedModulesList; } diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LocalVarPad.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LocalVarPad.cs index 27a736a7d6..e65f340180 100644 --- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LocalVarPad.cs +++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LocalVarPad.cs @@ -70,7 +70,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads /// /// This is not used anywhere, but it is neccessary to be overridden in children of AbstractPadContent. /// - public override object Content { + public override object Control { get { return localVarList; } diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/RunningThreadsPad.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/RunningThreadsPad.cs index ac8297fa36..aa63323ca5 100644 --- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/RunningThreadsPad.cs +++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/RunningThreadsPad.cs @@ -59,7 +59,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads ColumnHeader priority = new ColumnHeader(); ColumnHeader breaked = new ColumnHeader(); - public override object Content { + public override object Control { get { return runningThreadsList; } diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/WatchPad.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/WatchPad.cs index 8cd85be306..e73c1acde8 100644 --- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/WatchPad.cs +++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/WatchPad.cs @@ -134,7 +134,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads /// /// This is not used anywhere, but it is neccessary to be overridden in children of AbstractPadContent. /// - public override object Content { + public override object Control { get { return watchList; } diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/WatchPadCommands.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/WatchPadCommands.cs index 6542547662..03b8bf3602 100644 --- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/WatchPadCommands.cs +++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/WatchPadCommands.cs @@ -17,7 +17,7 @@ namespace Debugger.AddIn { if (this.Owner is WatchPad) { WatchPad pad = (WatchPad)this.Owner; - TreeViewAdv ctrl = (TreeViewAdv)pad.Content; + TreeViewAdv ctrl = (TreeViewAdv)pad.Control; string input = MessageService.ShowInputBox(StringParser.Parse("${res:MainWindow.Windows.Debug.Watch.AddWatch}"), StringParser.Parse("${res:MainWindow.Windows.Debug.Watch.EnterExpression}"), @@ -44,18 +44,18 @@ namespace Debugger.AddIn if (this.Owner is WatchPad) { WatchPad pad = (WatchPad)this.Owner; - TreeNodeAdv node = ((TreeViewAdv)pad.Content).SelectedNode; + TreeNodeAdv node = ((TreeViewAdv)pad.Control).SelectedNode; if (node == null) return; - while (node.Parent != ((TreeViewAdv)pad.Content).Root) + while (node.Parent != ((TreeViewAdv)pad.Control).Root) { node = node.Parent; } pad.Watches.RemoveAt(node.Index); - ((TreeViewAdv)pad.Content).Root.Children.Remove(node); + ((TreeViewAdv)pad.Control).Root.Children.Remove(node); ((WatchPad)this.Owner).RefreshPad(); } @@ -79,10 +79,10 @@ namespace Debugger.AddIn if (this.Owner is WatchPad) { WatchPad pad = (WatchPad)this.Owner; - ((TreeViewAdv)pad.Content).BeginUpdate(); + ((TreeViewAdv)pad.Control).BeginUpdate(); pad.Watches.Clear(); - ((TreeViewAdv)pad.Content).Root.Children.Clear(); - ((TreeViewAdv)pad.Content).EndUpdate(); + ((TreeViewAdv)pad.Control).Root.Children.Clear(); + ((TreeViewAdv)pad.Control).EndUpdate(); } } } diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/DynamicHelpPad.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/DynamicHelpPad.cs index 41629b7805..115eb300d4 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/DynamicHelpPad.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/DynamicHelpPad.cs @@ -43,7 +43,7 @@ namespace HtmlHelp2 private string debugPreElement = String.Empty; private bool enableDebugInfo = HtmlHelp2Environment.Config.DynamicHelpDebugInfos; - public override object Content + public override object Control { get { return dynamicHelpBrowser; } } diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexPad.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexPad.cs index 796c04d52c..4f3861a90e 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexPad.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexPad.cs @@ -33,7 +33,7 @@ namespace HtmlHelp2 { MSHelp2IndexControl help2IndexControl; - public override object Content + public override object Control { get { return help2IndexControl; } } diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexResultsPad.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexResultsPad.cs index e3eacb573a..220e865662 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexResultsPad.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexResultsPad.cs @@ -32,7 +32,7 @@ namespace HtmlHelp2 ColumnHeader title = new ColumnHeader(); ColumnHeader location = new ColumnHeader(); - public override object Content + public override object Control { get { return listView; } } diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/SearchPad.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/SearchPad.cs index ec90ca6478..5fdd7c7cbf 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/SearchPad.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/SearchPad.cs @@ -47,7 +47,7 @@ namespace HtmlHelp2 Label label2 = new Label(); bool searchIsBusy; - public override object Content + public override object Control { get { return mainPanel; } } diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/TocPad.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/TocPad.cs index 9e69a9455c..436b7cd30f 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/TocPad.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/TocPad.cs @@ -34,7 +34,7 @@ namespace HtmlHelp2 { MSHelp2TocControl help2TocControl; - public override object Content + public override object Control { get { return help2TocControl; } } diff --git a/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/OptionsPanels/General.cs b/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/OptionsPanels/General.cs index 5346f32f71..40b5d0ba61 100644 --- a/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/OptionsPanels/General.cs +++ b/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/OptionsPanels/General.cs @@ -31,7 +31,7 @@ namespace ICSharpCode.Profiler.AddIn.OptionsPanels panel = new GeneralOptionsPanel(); } - public override object Content { + public override object Control { get { return panel; } diff --git a/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/Views/WpfViewer.cs b/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/Views/WpfViewer.cs index 62b9206f0a..8c7041694c 100644 --- a/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/Views/WpfViewer.cs +++ b/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/Views/WpfViewer.cs @@ -27,10 +27,7 @@ namespace ICSharpCode.Profiler.AddIn.Views ProfilingDataProvider provider; ProfilerView dataView; - /// - /// The representing the view - /// - public override object Content { + public override object Control { get { return dataView; } diff --git a/src/AddIns/Misc/ResourceToolkit/Project/Src/Gui/UnusedResourceKeysViewContent.cs b/src/AddIns/Misc/ResourceToolkit/Project/Src/Gui/UnusedResourceKeysViewContent.cs index e8b18310c1..1a4209e995 100644 --- a/src/AddIns/Misc/ResourceToolkit/Project/Src/Gui/UnusedResourceKeysViewContent.cs +++ b/src/AddIns/Misc/ResourceToolkit/Project/Src/Gui/UnusedResourceKeysViewContent.cs @@ -28,7 +28,7 @@ namespace Hornung.ResourceToolkit.Gui ListView listView; ToolStrip toolStrip; - public override object Content { + public override object Control { get { return this.panel; } diff --git a/src/AddIns/Misc/StartPage/Project/Src/StartPageViewContent.cs b/src/AddIns/Misc/StartPage/Project/Src/StartPageViewContent.cs index cefa03f7ec..80852fcfcc 100644 --- a/src/AddIns/Misc/StartPage/Project/Src/StartPageViewContent.cs +++ b/src/AddIns/Misc/StartPage/Project/Src/StartPageViewContent.cs @@ -15,7 +15,7 @@ namespace ICSharpCode.StartPage { StartPageControl content = new StartPageControl(); - public override object Content { + public override object Control { get { return content; } diff --git a/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/HistoryViewDisplayBinding/HistoryView.cs b/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/HistoryViewDisplayBinding/HistoryView.cs index b6eac0ac97..a3cbaf3cd3 100644 --- a/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/HistoryViewDisplayBinding/HistoryView.cs +++ b/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/HistoryViewDisplayBinding/HistoryView.cs @@ -15,7 +15,7 @@ namespace ICSharpCode.Svn { HistoryViewPanel historyViewPanel; - public override object Content { + public override object Control { get { return historyViewPanel; } diff --git a/src/AddIns/Misc/UnitTesting/Src/UnitTestsPad.cs b/src/AddIns/Misc/UnitTesting/Src/UnitTestsPad.cs index 5424dcc63f..f961a452df 100644 --- a/src/AddIns/Misc/UnitTesting/Src/UnitTestsPad.cs +++ b/src/AddIns/Misc/UnitTesting/Src/UnitTestsPad.cs @@ -73,7 +73,7 @@ namespace ICSharpCode.UnitTesting } } - public override object Content { + public override object Control { get { return panel; } diff --git a/src/Main/Base/Project/Src/Gui/AbstractPadContent.cs b/src/Main/Base/Project/Src/Gui/AbstractPadContent.cs index 7c2e03781c..17994bc96c 100644 --- a/src/Main/Base/Project/Src/Gui/AbstractPadContent.cs +++ b/src/Main/Base/Project/Src/Gui/AbstractPadContent.cs @@ -12,7 +12,7 @@ namespace ICSharpCode.SharpDevelop.Gui { public abstract class AbstractPadContent : IPadContent { - public abstract object Content { + public abstract object Control { get; } diff --git a/src/Main/Base/Project/Src/Gui/AbstractViewContent.cs b/src/Main/Base/Project/Src/Gui/AbstractViewContent.cs index fa97277216..f20a7d39a5 100644 --- a/src/Main/Base/Project/Src/Gui/AbstractViewContent.cs +++ b/src/Main/Base/Project/Src/Gui/AbstractViewContent.cs @@ -45,7 +45,7 @@ namespace ICSharpCode.SharpDevelop.Gui this.Files.Add(file); } - public abstract object Content { + public abstract object Control { get; } diff --git a/src/Main/Base/Project/Src/Gui/AbstractViewContentHandlingLoadErrors.cs b/src/Main/Base/Project/Src/Gui/AbstractViewContentHandlingLoadErrors.cs index 5805ad16fd..d64e343fdb 100644 --- a/src/Main/Base/Project/Src/Gui/AbstractViewContentHandlingLoadErrors.cs +++ b/src/Main/Base/Project/Src/Gui/AbstractViewContentHandlingLoadErrors.cs @@ -40,7 +40,7 @@ namespace ICSharpCode.SharpDevelop.Gui { } - public sealed override object Content { + public sealed override object Control { get { return contentControl; } } diff --git a/src/Main/Base/Project/Src/Gui/BrowserDisplayBinding/HtmlViewPane.cs b/src/Main/Base/Project/Src/Gui/BrowserDisplayBinding/HtmlViewPane.cs index 453ff51c3a..eb21d0627c 100644 --- a/src/Main/Base/Project/Src/Gui/BrowserDisplayBinding/HtmlViewPane.cs +++ b/src/Main/Base/Project/Src/Gui/BrowserDisplayBinding/HtmlViewPane.cs @@ -26,7 +26,7 @@ namespace ICSharpCode.SharpDevelop.BrowserDisplayBinding } } - public override object Content { + public override object Control { get { return htmlViewPane; } diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/AbstractOptionPanel.cs b/src/Main/Base/Project/Src/Gui/Dialogs/AbstractOptionPanel.cs index 54d13831ff..ee9d9b94ea 100644 --- a/src/Main/Base/Project/Src/Gui/Dialogs/AbstractOptionPanel.cs +++ b/src/Main/Base/Project/Src/Gui/Dialogs/AbstractOptionPanel.cs @@ -13,7 +13,7 @@ namespace ICSharpCode.SharpDevelop.Gui { public virtual object Owner { get; set; } - public abstract object Content { get; } + public abstract object Control { get; } public abstract void LoadOptions(); public abstract bool SaveOptions(); } diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/XmlFormsOptionPanel.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/XmlFormsOptionPanel.cs index 13fbeb2aba..8ec4f9bca5 100644 --- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/XmlFormsOptionPanel.cs +++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/XmlFormsOptionPanel.cs @@ -18,7 +18,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels { public object Owner { get; set; } - public object Content { + public object Control { get { return this; } diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/ProjectOptionsView.cs b/src/Main/Base/Project/Src/Gui/Dialogs/ProjectOptionsView.cs index d43439fc9d..11fd84d7ab 100644 --- a/src/Main/Base/Project/Src/Gui/Dialogs/ProjectOptionsView.cs +++ b/src/Main/Base/Project/Src/Gui/Dialogs/ProjectOptionsView.cs @@ -29,7 +29,7 @@ namespace ICSharpCode.SharpDevelop.Project.Dialogs } } - public override object Content { + public override object Control { get { return tabControl; } diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/TabbedOptions.cs b/src/Main/Base/Project/Src/Gui/Dialogs/TabbedOptions.cs index 617a9e4128..bb897bc19d 100644 --- a/src/Main/Base/Project/Src/Gui/Dialogs/TabbedOptions.cs +++ b/src/Main/Base/Project/Src/Gui/Dialogs/TabbedOptions.cs @@ -110,7 +110,7 @@ namespace ICSharpCode.SharpDevelop.Gui ICanBeDirty dirty = optionPanel as ICanBeDirty; if (dirty != null) dirty.IsDirtyChanged += options.OnIsDirtyChanged; - this.SetContent(optionPanel.Content); + this.SetContent(optionPanel.Control); } } } diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/TreeViewOptionsDialog.xaml.cs b/src/Main/Base/Project/Src/Gui/Dialogs/TreeViewOptionsDialog.xaml.cs index be1e4611c5..5076feee6e 100644 --- a/src/Main/Base/Project/Src/Gui/Dialogs/TreeViewOptionsDialog.xaml.cs +++ b/src/Main/Base/Project/Src/Gui/Dialogs/TreeViewOptionsDialog.xaml.cs @@ -114,7 +114,7 @@ namespace ICSharpCode.SharpDevelop.Gui optionPanel.LoadOptions(); dialog.optionPanels.Add(optionPanel); } - return optionPanel.Content; + return optionPanel.Control; } } diff --git a/src/Main/Base/Project/Src/Gui/IPadContent.cs b/src/Main/Base/Project/Src/Gui/IPadContent.cs index d30c560637..5cbf917a1a 100644 --- a/src/Main/Base/Project/Src/Gui/IPadContent.cs +++ b/src/Main/Base/Project/Src/Gui/IPadContent.cs @@ -20,7 +20,7 @@ namespace ICSharpCode.SharpDevelop.Gui /// This is the UI element for the view. /// You can use both Windows.Forms and WPF controls. /// - object Content { + object Control { get; } } diff --git a/src/Main/Base/Project/Src/Gui/IViewContent.cs b/src/Main/Base/Project/Src/Gui/IViewContent.cs index 66ddef38ff..beef322a67 100644 --- a/src/Main/Base/Project/Src/Gui/IViewContent.cs +++ b/src/Main/Base/Project/Src/Gui/IViewContent.cs @@ -41,7 +41,7 @@ namespace ICSharpCode.SharpDevelop.Gui /// This is the UI element for the view. /// You can use both Windows.Forms and WPF controls. /// - object Content { + object Control { get; } diff --git a/src/Main/Base/Project/Src/Gui/Pads/ClassBrowser/ClassBrowser.cs b/src/Main/Base/Project/Src/Gui/Pads/ClassBrowser/ClassBrowser.cs index 2e3c9bce82..89b4a005b6 100644 --- a/src/Main/Base/Project/Src/Gui/Pads/ClassBrowser/ClassBrowser.cs +++ b/src/Main/Base/Project/Src/Gui/Pads/ClassBrowser/ClassBrowser.cs @@ -59,7 +59,7 @@ namespace ICSharpCode.SharpDevelop.Gui.ClassBrowser } } - public override object Content { + public override object Control { get { return contentPanel; } diff --git a/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs b/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs index ec91c9c552..080417cecf 100644 --- a/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs +++ b/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs @@ -108,7 +108,7 @@ namespace ICSharpCode.SharpDevelop.Gui } } - public override object Content { + public override object Control { get { return myPanel; } @@ -342,7 +342,7 @@ namespace ICSharpCode.SharpDevelop.Gui if (fullText.Length > 0) { //int line = textEditorControl.ActiveTextAreaControl.Caret.Line; //string textLine = TextUtilities.GetLineAsString(textEditorControl.Document, line); - Point clickPos = textEditorControl.PointToClient(Control.MousePosition); + Point clickPos = textEditorControl.PointToClient(System.Windows.Forms.Control.MousePosition); int index = textEditorControl.GetCharIndexFromPosition(clickPos); int start = index; // find start of current line diff --git a/src/Main/Base/Project/Src/Gui/Pads/DefinitionViewPad.cs b/src/Main/Base/Project/Src/Gui/Pads/DefinitionViewPad.cs index 279df6c71a..35c8262eaa 100644 --- a/src/Main/Base/Project/Src/Gui/Pads/DefinitionViewPad.cs +++ b/src/Main/Base/Project/Src/Gui/Pads/DefinitionViewPad.cs @@ -25,7 +25,7 @@ namespace ICSharpCode.SharpDevelop.Gui /// /// The representing the pad /// - public override object Content { + public override object Control { get { return ctl; } diff --git a/src/Main/Base/Project/Src/Gui/Pads/ErrorList/ErrorListPad.cs b/src/Main/Base/Project/Src/Gui/Pads/ErrorList/ErrorListPad.cs index 3074cb520c..25018e6a1a 100644 --- a/src/Main/Base/Project/Src/Gui/Pads/ErrorList/ErrorListPad.cs +++ b/src/Main/Base/Project/Src/Gui/Pads/ErrorList/ErrorListPad.cs @@ -67,7 +67,7 @@ namespace ICSharpCode.SharpDevelop.Gui } } - public override object Content { + public override object Control { get { return contentPanel; } diff --git a/src/Main/Base/Project/Src/Gui/Pads/FileScout.cs b/src/Main/Base/Project/Src/Gui/Pads/FileScout.cs index cb8102259e..47d616c895 100644 --- a/src/Main/Base/Project/Src/Gui/Pads/FileScout.cs +++ b/src/Main/Base/Project/Src/Gui/Pads/FileScout.cs @@ -325,16 +325,12 @@ namespace ICSharpCode.SharpDevelop.Gui public class FileScout : UserControl, IPadContent { - public object Content { + public object Control { get { return this; } } - public void RedrawContent() - { - } - Splitter splitter1 = new Splitter(); FileList filelister = new FileList(); diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserPad.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserPad.cs index 91d4452c30..372ae73abe 100644 --- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserPad.cs +++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserPad.cs @@ -63,7 +63,7 @@ namespace ICSharpCode.SharpDevelop.Project } } - public override object Content { + public override object Control { get { return projectBrowserPanel; } diff --git a/src/Main/Base/Project/Src/Gui/Pads/PropertyPad/PropertyPad.cs b/src/Main/Base/Project/Src/Gui/Pads/PropertyPad/PropertyPad.cs index a2774c78b7..88f68c1584 100644 --- a/src/Main/Base/Project/Src/Gui/Pads/PropertyPad/PropertyPad.cs +++ b/src/Main/Base/Project/Src/Gui/Pads/PropertyPad/PropertyPad.cs @@ -120,7 +120,7 @@ namespace ICSharpCode.SharpDevelop.Gui public static event EventHandler SelectedObjectChanged; public static event SelectedGridItemChangedEventHandler SelectedGridItemChanged; - public override object Content { + public override object Control { get { return contentControl; } diff --git a/src/Main/Base/Project/Src/Gui/Pads/SearchResultPad/SearchResultPanel.cs b/src/Main/Base/Project/Src/Gui/Pads/SearchResultPad/SearchResultPanel.cs index a2d8404d41..237409b99a 100644 --- a/src/Main/Base/Project/Src/Gui/Pads/SearchResultPad/SearchResultPanel.cs +++ b/src/Main/Base/Project/Src/Gui/Pads/SearchResultPad/SearchResultPanel.cs @@ -50,7 +50,7 @@ namespace SearchAndReplace string curPattern = null; IList curResults = null; - public override object Content { + public override object Control { get { return myPanel; } diff --git a/src/Main/Base/Project/Src/Gui/Pads/TaskList/TaskListPad.cs b/src/Main/Base/Project/Src/Gui/Pads/TaskList/TaskListPad.cs index db5bf77b41..ebc1c844ca 100644 --- a/src/Main/Base/Project/Src/Gui/Pads/TaskList/TaskListPad.cs +++ b/src/Main/Base/Project/Src/Gui/Pads/TaskList/TaskListPad.cs @@ -46,7 +46,7 @@ namespace ICSharpCode.SharpDevelop.Gui } } - public override object Content { + public override object Control { get { return contentPanel; } @@ -76,8 +76,8 @@ namespace ICSharpCode.SharpDevelop.Gui if (WorkbenchSingleton.Workbench.ActiveViewContent != null) { UpdateItems(); - if (WorkbenchSingleton.Workbench.ActiveViewContent.Content is SharpDevelopTextAreaControl) { - SharpDevelopTextAreaControl ctrl = WorkbenchSingleton.Workbench.ActiveViewContent.Content as SharpDevelopTextAreaControl; + if (WorkbenchSingleton.Workbench.ActiveViewContent.Control is SharpDevelopTextAreaControl) { + SharpDevelopTextAreaControl ctrl = WorkbenchSingleton.Workbench.ActiveViewContent.Control as SharpDevelopTextAreaControl; ctrl.ActiveTextAreaControl.Caret.PositionChanged += new EventHandler(CaretPositionChanged); } @@ -103,8 +103,8 @@ namespace ICSharpCode.SharpDevelop.Gui if (isInitialized) UpdateItems(); - if (WorkbenchSingleton.Workbench.ActiveViewContent.Content is SharpDevelopTextAreaControl) { - SharpDevelopTextAreaControl ctrl = WorkbenchSingleton.Workbench.ActiveViewContent.Content as SharpDevelopTextAreaControl; + if (WorkbenchSingleton.Workbench.ActiveViewContent.Control is SharpDevelopTextAreaControl) { + SharpDevelopTextAreaControl ctrl = WorkbenchSingleton.Workbench.ActiveViewContent.Control as SharpDevelopTextAreaControl; ctrl.ActiveTextAreaControl.Caret.PositionChanged += new EventHandler(CaretPositionChanged); } diff --git a/src/Main/Base/Project/Src/Gui/Pads/ToolsPad.cs b/src/Main/Base/Project/Src/Gui/Pads/ToolsPad.cs index 95efbaa1e2..db650a323a 100644 --- a/src/Main/Base/Project/Src/Gui/Pads/ToolsPad.cs +++ b/src/Main/Base/Project/Src/Gui/Pads/ToolsPad.cs @@ -29,7 +29,7 @@ namespace ICSharpCode.SharpDevelop.Gui { ContentControl contentControl = new ContentControl(); - public override object Content { + public override object Control { get { return contentControl; } diff --git a/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonPadContent.cs b/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonPadContent.cs index 375353eb5a..0c93268f20 100644 --- a/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonPadContent.cs +++ b/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonPadContent.cs @@ -52,7 +52,7 @@ namespace ICSharpCode.SharpDevelop.Gui placeholder.IsVisibleChanged -= AvalonPadContent_IsVisibleChanged; padInstance = descriptor.PadContent; if (padInstance != null) { - this.SetContent(padInstance.Content, padInstance); + this.SetContent(padInstance.Control, padInstance); placeholder = null; } } diff --git a/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonWorkbenchWindow.cs b/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonWorkbenchWindow.cs index c18c7f600e..0092fa2dbe 100644 --- a/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonWorkbenchWindow.cs +++ b/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonWorkbenchWindow.cs @@ -120,7 +120,7 @@ namespace ICSharpCode.SharpDevelop.Gui window.RegisterNewContent(item); if (Count == 1) { - window.SetContent(item.Content, item); + window.SetContent(item.Control, item); } else { if (Count == 2) { window.CreateViewTabControl(); @@ -129,13 +129,13 @@ namespace ICSharpCode.SharpDevelop.Gui TabItem oldPage = new TabItem(); oldPage.Header = StringParser.Parse(oldItem.TabPageText); - oldPage.SetContent(oldItem.Content, oldItem); + oldPage.SetContent(oldItem.Control, oldItem); window.viewTabControl.Items.Add(oldPage); } TabItem newPage = new TabItem(); newPage.Header = StringParser.Parse(item.TabPageText); - newPage.SetContent(item.Content, item); + newPage.SetContent(item.Control, item); window.viewTabControl.Items.Insert(index, newPage); } @@ -151,7 +151,7 @@ namespace ICSharpCode.SharpDevelop.Gui if (Count < 2) { window.ClearContent(); if (Count == 1) { - window.SetContent(this[0].Content, this[0]); + window.SetContent(this[0].Control, this[0]); } } else { window.viewTabControl.Items.RemoveAt(index); @@ -169,10 +169,10 @@ namespace ICSharpCode.SharpDevelop.Gui if (Count == 1) { window.ClearContent(); - window.SetContent(item.Content, item); + window.SetContent(item.Control, item); } else { TabItem page = (TabItem)window.viewTabControl.Items[index]; - page.SetContent(item.Content, item); + page.SetContent(item.Control, item); page.Header = StringParser.Parse(item.TabPageText); } window.UpdateActiveViewContent(); diff --git a/src/Main/Base/Project/Src/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs b/src/Main/Base/Project/Src/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs index 3e661d50c1..860ed1dfa0 100644 --- a/src/Main/Base/Project/Src/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs +++ b/src/Main/Base/Project/Src/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs @@ -389,7 +389,7 @@ namespace ICSharpCode.SharpDevelop.Gui IPadContent content = padDescriptor.PadContent; if (content == null) return; - Control control = content.Content; + Control control = content.Control; control.Dock = DockStyle.Fill; Controls.Add(control); } @@ -564,7 +564,7 @@ namespace ICSharpCode.SharpDevelop.Gui return oldSdiWindow; } } - content.Content.Dock = DockStyle.Fill; + content.Control.Dock = DockStyle.Fill; SdiWorkspaceWindow sdiWorkspaceWindow = new SdiWorkspaceWindow(); sdiWorkspaceWindow.ViewContents.Add(content); sdiWorkspaceWindow.ViewContents.AddRange(content.SecondaryViewContents); diff --git a/src/Main/Base/Project/Src/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs b/src/Main/Base/Project/Src/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs index f155f27ef2..fafc72ba6d 100644 --- a/src/Main/Base/Project/Src/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs +++ b/src/Main/Base/Project/Src/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs @@ -123,9 +123,9 @@ namespace ICSharpCode.SharpDevelop.Gui window.RegisterNewContent(item); - item.Content.Dock = DockStyle.Fill; + item.Control.Dock = DockStyle.Fill; if (Count == 1) { - window.Controls.Add(item.Content); + window.Controls.Add(item.Control); } else { if (Count == 2) { window.CreateViewTabControl(); @@ -133,12 +133,12 @@ namespace ICSharpCode.SharpDevelop.Gui if (oldItem == item) oldItem = this[1]; TabPage oldPage = new TabPage(StringParser.Parse(oldItem.TabPageText)); - oldPage.Controls.Add(oldItem.Content); + oldPage.Controls.Add(oldItem.Control); window.viewTabControl.TabPages.Add(oldPage); } TabPage newPage = new TabPage(StringParser.Parse(item.TabPageText)); - newPage.Controls.Add(item.Content); + newPage.Controls.Add(item.Control); // Work around bug in TabControl: TabPages.Insert has no effect if inserting at end if (index == window.viewTabControl.TabPages.Count) { @@ -159,7 +159,7 @@ namespace ICSharpCode.SharpDevelop.Gui if (Count < 2) { window.ClearContent(); if (Count == 1) { - window.Controls.Add(this[0].Content); + window.Controls.Add(this[0].Control); } } else { window.viewTabControl.TabPages.RemoveAt(index); @@ -175,14 +175,14 @@ namespace ICSharpCode.SharpDevelop.Gui window.RegisterNewContent(item); - item.Content.Dock = DockStyle.Fill; + item.Control.Dock = DockStyle.Fill; if (Count == 1) { window.ClearContent(); - window.Controls.Add(item.Content); + window.Controls.Add(item.Control); } else { TabPage page = window.viewTabControl.TabPages[index]; page.Controls.Clear(); - page.Controls.Add(item.Content); + page.Controls.Add(item.Control); page.Text = StringParser.Parse(item.TabPageText); } window.UpdateActiveViewContent(); diff --git a/src/Main/Base/Project/Src/Gui/Workbench/Layouts/SimpleWorkbenchLayout.cs b/src/Main/Base/Project/Src/Gui/Workbench/Layouts/SimpleWorkbenchLayout.cs index 298c117662..1138cf89dc 100644 --- a/src/Main/Base/Project/Src/Gui/Workbench/Layouts/SimpleWorkbenchLayout.cs +++ b/src/Main/Base/Project/Src/Gui/Workbench/Layouts/SimpleWorkbenchLayout.cs @@ -90,7 +90,7 @@ namespace ICSharpCode.SharpDevelop.Gui { this.Text = StringParser.Parse(desc.Title); - Control ctl = desc.PadContent.Content; + Control ctl = desc.PadContent.Control; ctl.Dock = DockStyle.Fill; Controls.Add(ctl); } @@ -326,9 +326,9 @@ namespace ICSharpCode.SharpDevelop.Gui window.RegisterNewContent(item); - item.Content.Dock = DockStyle.Fill; + item.Control.Dock = DockStyle.Fill; if (Count == 1) { - window.Controls.Add(item.Content); + window.Controls.Add(item.Control); } else { if (Count == 2) { window.CreateViewTabControl(); @@ -336,12 +336,12 @@ namespace ICSharpCode.SharpDevelop.Gui if (oldItem == item) oldItem = this[1]; TabPage oldPage = new TabPage(StringParser.Parse(oldItem.TabPageText)); - oldPage.Controls.Add(oldItem.Content); + oldPage.Controls.Add(oldItem.Control); window.viewTabControl.TabPages.Add(oldPage); } TabPage newPage = new TabPage(StringParser.Parse(item.TabPageText)); - newPage.Controls.Add(item.Content); + newPage.Controls.Add(item.Control); // Work around bug in TabControl: TabPages.Insert has no effect if inserting at end if (index == window.viewTabControl.TabPages.Count) { @@ -362,7 +362,7 @@ namespace ICSharpCode.SharpDevelop.Gui if (Count < 2) { window.ClearContent(); if (Count == 1) { - window.Controls.Add(this[0].Content); + window.Controls.Add(this[0].Control); } } else { window.viewTabControl.TabPages.RemoveAt(index); @@ -378,14 +378,14 @@ namespace ICSharpCode.SharpDevelop.Gui window.RegisterNewContent(item); - item.Content.Dock = DockStyle.Fill; + item.Control.Dock = DockStyle.Fill; if (Count == 1) { window.ClearContent(); - window.Controls.Add(item.Content); + window.Controls.Add(item.Control); } else { TabPage page = window.viewTabControl.TabPages[index]; page.Controls.Clear(); - page.Controls.Add(item.Content); + page.Controls.Add(item.Control); page.Text = StringParser.Parse(item.TabPageText); } window.UpdateActiveViewContent(); diff --git a/src/Main/Base/Project/Src/Internal/Doozers/IOptionPanel.cs b/src/Main/Base/Project/Src/Internal/Doozers/IOptionPanel.cs index acbd31c9e7..088e1bc7e4 100644 --- a/src/Main/Base/Project/Src/Internal/Doozers/IOptionPanel.cs +++ b/src/Main/Base/Project/Src/Internal/Doozers/IOptionPanel.cs @@ -18,7 +18,7 @@ namespace ICSharpCode.SharpDevelop /// object Owner { get; set; } - object Content { + object Control { get; } diff --git a/src/Main/Base/Project/Src/Project/AbstractProject.cs b/src/Main/Base/Project/Src/Project/AbstractProject.cs index 46ec75b092..9d8fd45980 100644 --- a/src/Main/Base/Project/Src/Project/AbstractProject.cs +++ b/src/Main/Base/Project/Src/Project/AbstractProject.cs @@ -513,5 +513,34 @@ namespace ICSharpCode.SharpDevelop.Project return result; } } + + public ProjectBuildOptions CreateProjectBuildOptions(BuildOptions options, bool isRootBuildable) + { + if (options == null) + throw new ArgumentNullException("options"); + // start of default implementation + var configMatchings = this.ParentSolution.GetActiveConfigurationsAndPlatformsForProjects(options.SolutionConfiguration, options.SolutionPlatform); + ProjectBuildOptions projectOptions = new ProjectBuildOptions(isRootBuildable ? options.ProjectTarget : options.TargetForDependencies); + // find the project configuration + foreach (var matching in configMatchings) { + if (matching.Project == this) { + projectOptions.Configuration = matching.Configuration; + projectOptions.Platform = matching.Platform; + } + } + if (string.IsNullOrEmpty(projectOptions.Configuration)) + projectOptions.Configuration = options.SolutionConfiguration; + if (string.IsNullOrEmpty(projectOptions.Platform)) + projectOptions.Platform = options.SolutionPlatform; + + // copy properties to project options + options.GlobalAdditionalProperties.ForEach(projectOptions.Properties.Add); + if (isRootBuildable) { + foreach (var pair in options.ProjectAdditionalProperties) { + projectOptions.Properties[pair.Key] = pair.Value; + } + } + return projectOptions; + } } } diff --git a/src/Main/Base/Project/Src/Project/CompilableProject.cs b/src/Main/Base/Project/Src/Project/CompilableProject.cs index cd5aca2550..1c235bc47e 100644 --- a/src/Main/Base/Project/Src/Project/CompilableProject.cs +++ b/src/Main/Base/Project/Src/Project/CompilableProject.cs @@ -231,23 +231,6 @@ namespace ICSharpCode.SharpDevelop.Project return text; } - [Obsolete("Override CreateStartInfo instead of using Start()")] - protected void Start(string program, bool withDebugging) - { - ProcessStartInfo psi; - try { - psi = CreateStartInfo(); - } catch (ProjectStartException ex) { - MessageService.ShowError(ex.Message); - return; - } - if (withDebugging) { - DebuggerService.CurrentDebugger.Start(psi); - } else { - DebuggerService.CurrentDebugger.StartWithoutDebugging(psi); - } - } - /// /// Creates a for the specified program, using /// arguments and working directory from the project options. diff --git a/src/Main/Base/Project/Src/Project/IProject.cs b/src/Main/Base/Project/Src/Project/IProject.cs index ee87c80dd3..19951eeb10 100644 --- a/src/Main/Base/Project/Src/Project/IProject.cs +++ b/src/Main/Base/Project/Src/Project/IProject.cs @@ -280,60 +280,18 @@ namespace ICSharpCode.SharpDevelop.Project /// Gets the parent solution. /// Solution ParentSolution { get; } - } - - // We cannot extend an existing interface in 3.x because we don't want to break addin compatibility. - // TODO: merge this interface with IBuildable in SharpDevelop 4.0 - public interface IBuildable2 : IBuildable - { + /// /// Creates the project-specific build options. /// /// The global build options. - /// Specifies whether this project is the main buildable item - /// (i.e. the ). + /// Specifies whether this project is the main buildable item. + /// The root buildable is the buildable for which and apply. + /// The dependencies of that root buildable are the non-root buildables. /// The project-specific build options. ProjectBuildOptions CreateProjectBuildOptions(BuildOptions options, bool isRootBuildable); } - /// - /// Provides the IBuildable2 methods in IBuildable. - /// For classes not implementing IBuildable2, a default implementation is used. - /// - public static class IBuildableExtension - { - public static ProjectBuildOptions CreateProjectBuildOptions(this IBuildable buildable, BuildOptions options, bool isRootBuildable) - { - IBuildable2 buildable2 = buildable as IBuildable2; - if (buildable2 != null) { - return buildable2.CreateProjectBuildOptions(options, isRootBuildable); - } - // start of default implementation - var configMatchings = buildable.ParentSolution.GetActiveConfigurationsAndPlatformsForProjects(options.SolutionConfiguration, options.SolutionPlatform); - ProjectBuildOptions projectOptions = new ProjectBuildOptions(isRootBuildable ? options.ProjectTarget : options.TargetForDependencies); - // find the project configuration - foreach (var matching in configMatchings) { - if (matching.Project == buildable) { - projectOptions.Configuration = matching.Configuration; - projectOptions.Platform = matching.Platform; - } - } - if (string.IsNullOrEmpty(projectOptions.Configuration)) - projectOptions.Configuration = options.SolutionConfiguration; - if (string.IsNullOrEmpty(projectOptions.Platform)) - projectOptions.Platform = options.SolutionPlatform; - - // copy properties to project options - options.GlobalAdditionalProperties.ForEach(projectOptions.Properties.Add); - if (isRootBuildable) { - foreach (var pair in options.ProjectAdditionalProperties) { - projectOptions.Properties[pair.Key] = pair.Value; - } - } - return projectOptions; - } - } - /// /// Interface for adding and removing items from a project. Not part of the IProject /// interface because in nearly all cases, ProjectService.Add/RemoveProjectItem should diff --git a/src/Main/Base/Project/Src/Project/Solution/Solution.cs b/src/Main/Base/Project/Src/Project/Solution/Solution.cs index 18b5a0ff0d..46357312dc 100644 --- a/src/Main/Base/Project/Src/Project/Solution/Solution.cs +++ b/src/Main/Base/Project/Src/Project/Solution/Solution.cs @@ -770,7 +770,7 @@ namespace ICSharpCode.SharpDevelop.Project } } - internal class ProjectConfigurationPlatformMatching + internal sealed class ProjectConfigurationPlatformMatching { public readonly IProject Project; public string Configuration; @@ -1192,6 +1192,11 @@ namespace ICSharpCode.SharpDevelop.Project // building a solution finishes immediately: we only care for the dependencies feedbackSink.Done(true); } + + ProjectBuildOptions IBuildable.CreateProjectBuildOptions(BuildOptions options, bool isRootBuildable) + { + return null; + } #endregion public override string ToString() diff --git a/src/Main/Base/Project/Src/Services/ProjectService/CompileModifiedProjectsOnly.cs b/src/Main/Base/Project/Src/Services/ProjectService/CompileModifiedProjectsOnly.cs index daab240096..5ad2863bc8 100644 --- a/src/Main/Base/Project/Src/Services/ProjectService/CompileModifiedProjectsOnly.cs +++ b/src/Main/Base/Project/Src/Services/ProjectService/CompileModifiedProjectsOnly.cs @@ -118,7 +118,7 @@ namespace ICSharpCode.SharpDevelop.Project } } - sealed class DummyBuildable : IBuildable2 + sealed class DummyBuildable : IBuildable { IBuildable wrappedBuildable; @@ -183,7 +183,7 @@ namespace ICSharpCode.SharpDevelop.Project } } - sealed class Wrapper : IBuildable2 + sealed class Wrapper : IBuildable { internal readonly IBuildable wrapped; internal readonly WrapperFactory factory; diff --git a/src/Main/Base/Project/Src/TextEditor/Bookmarks/Pad/BookmarkPad.cs b/src/Main/Base/Project/Src/TextEditor/Bookmarks/Pad/BookmarkPad.cs index 1f71afd65c..9c16e7a057 100644 --- a/src/Main/Base/Project/Src/TextEditor/Bookmarks/Pad/BookmarkPad.cs +++ b/src/Main/Base/Project/Src/TextEditor/Bookmarks/Pad/BookmarkPad.cs @@ -40,7 +40,7 @@ namespace ICSharpCode.SharpDevelop.Bookmarks Dictionary fileNodes = new Dictionary(); - public override object Content { + public override object Control { get { return myPanel; } diff --git a/src/Main/Base/Project/Src/TextEditor/Gui/Editor/TextEditorBasedPad.cs b/src/Main/Base/Project/Src/TextEditor/Gui/Editor/TextEditorBasedPad.cs index 7e2c03c9e8..d144ddf522 100644 --- a/src/Main/Base/Project/Src/TextEditor/Gui/Editor/TextEditorBasedPad.cs +++ b/src/Main/Base/Project/Src/TextEditor/Gui/Editor/TextEditorBasedPad.cs @@ -30,7 +30,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor } } - public override object Content { + public override object Control { get { return this.TextEditorControl; } } diff --git a/src/Main/Base/Project/Src/TextEditor/Gui/Editor/TextEditorDisplayBinding.cs b/src/Main/Base/Project/Src/TextEditor/Gui/Editor/TextEditorDisplayBinding.cs index 50ca281dee..1a5b5a6782 100644 --- a/src/Main/Base/Project/Src/TextEditor/Gui/Editor/TextEditorDisplayBinding.cs +++ b/src/Main/Base/Project/Src/TextEditor/Gui/Editor/TextEditorDisplayBinding.cs @@ -142,7 +142,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor } } - public override object Content { + public override object Control { get { return textEditorControl; } diff --git a/src/Main/Base/Test/StringTagProvider/MockProjectForTagProvider.cs b/src/Main/Base/Test/StringTagProvider/MockProjectForTagProvider.cs index 450a17d713..fff99390b9 100644 --- a/src/Main/Base/Test/StringTagProvider/MockProjectForTagProvider.cs +++ b/src/Main/Base/Test/StringTagProvider/MockProjectForTagProvider.cs @@ -260,6 +260,11 @@ namespace ICSharpCode.SharpDevelop.Tests.StringTagProvider throw new NotImplementedException(); } + public ProjectBuildOptions CreateProjectBuildOptions(BuildOptions options, bool isRootBuildable) + { + throw new NotImplementedException(); + } + public void Dispose() { throw new NotImplementedException(); diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Interfaces/IEntity.cs b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Interfaces/IEntity.cs index c87e39f5fc..2036255d30 100644 --- a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Interfaces/IEntity.cs +++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Interfaces/IEntity.cs @@ -108,10 +108,12 @@ namespace ICSharpCode.SharpDevelop.Dom get; } + [Obsolete("This property does not do what one would expect - it merely checks if protected+internal are set, it is not the equivalent of AssemblyAndFamily in Reflection!")] bool IsProtectedAndInternal { get; } + [Obsolete("This property does not do what one would expect - it merely checks if one of protected+internal is set, it is not the equivalent of AssemblyOrFamily in Reflection!")] bool IsProtectedOrInternal { get; } diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/ProjectContent/DefaultProjectContent.cs b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/ProjectContent/DefaultProjectContent.cs index 823f8c317f..3fb2c8c823 100644 --- a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/ProjectContent/DefaultProjectContent.cs +++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/ProjectContent/DefaultProjectContent.cs @@ -748,12 +748,6 @@ namespace ICSharpCode.SharpDevelop.Dom return GetNamespaces(language).ContainsKey(name); } - - public string SearchNamespace(string name, IClass curType, ICompilationUnit unit, int caretLine, int caretColumn) - { - return SearchType(new SearchTypeRequest(name, 0, curType, unit, caretLine, caretColumn)).NamespaceResult; - } - bool MatchesRequest(ref SearchTypeRequest request, ref SearchTypeResult result) { if (result.NamespaceResult != null) diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/ProjectContent/IProjectContent.cs b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/ProjectContent/IProjectContent.cs index c6e3057a5b..8e67302e7c 100644 --- a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/ProjectContent/IProjectContent.cs +++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/ProjectContent/IProjectContent.cs @@ -96,9 +96,6 @@ namespace ICSharpCode.SharpDevelop.Dom /// void AddNamespaceContents(ArrayList list, string subNameSpace, LanguageProperties language, bool lookInReferences); - [Obsolete] - string SearchNamespace(string name, IClass curType, ICompilationUnit unit, int caretLine, int caretColumn); - SearchTypeResult SearchType(SearchTypeRequest request); ///