Browse Source

Rename Content property back to Control (IViewContent, IPadContent, IOptionsPanel) to prevent the C# compiler from automatically picking up a Content property from a base class.

The name 'Content' could result in a hard to understand exception 'Specified element is already the logical child of another element. Disconnect it first.' when implementing IOptionPanel in a WPF UserControl. See forum-9233.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@4018 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 17 years ago
parent
commit
4c485fabf7
  1. 2
      src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonConsolePad.cs
  2. 5
      src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockProject.cs
  3. 2
      src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockViewContent.cs
  4. 2
      src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/PackageFilesView.cs
  5. 2
      src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/SetupDialogListPad.cs
  6. 2
      src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/AvalonEditViewContent.cs
  7. 2
      src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramCommand.cs
  8. 2
      src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramViewContent.cs
  9. 2
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs
  10. 2
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/FormKeyHandler.cs
  11. 2
      src/AddIns/DisplayBindings/HexEditor/Project/Src/View/HexEditView.cs
  12. 2
      src/AddIns/DisplayBindings/IconEditor/IconEditorAddIn/Src/IconViewContent.cs
  13. 2
      src/AddIns/DisplayBindings/SettingsEditor/Project/SettingsViewContent.cs
  14. 2
      src/AddIns/DisplayBindings/WorkflowDesigner/Project/Src/PrimaryView/PrimaryViewContent.cs
  15. 2
      src/AddIns/DisplayBindings/WorkflowDesigner/Project/Src/SecondaryView/SecondaryViewContent.cs
  16. 2
      src/AddIns/DisplayBindings/XmlEditor/Project/Src/XPathQueryPad.cs
  17. 2
      src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlTreeView.cs
  18. 2
      src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlView.cs
  19. 2
      src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlTreeViewClipboardHandlerTestFixture.cs
  20. 2
      src/AddIns/Misc/AddinScout/Project/Src/AddInScoutViewContent.cs
  21. 2
      src/AddIns/Misc/CodeCoverage/Project/Src/CodeCoveragePad.cs
  22. 2
      src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Src/ComponentInspectorView.cs
  23. 2
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/CallStackPad.cs
  24. 2
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LoadedModulesPad.cs
  25. 2
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LocalVarPad.cs
  26. 2
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/RunningThreadsPad.cs
  27. 2
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/WatchPad.cs
  28. 14
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/WatchPadCommands.cs
  29. 2
      src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/DynamicHelpPad.cs
  30. 2
      src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexPad.cs
  31. 2
      src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexResultsPad.cs
  32. 2
      src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/SearchPad.cs
  33. 2
      src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/TocPad.cs
  34. 2
      src/AddIns/Misc/Profiler/Frontend/AddIn/Src/OptionsPanels/General.cs
  35. 5
      src/AddIns/Misc/Profiler/Frontend/AddIn/Src/Views/WpfViewer.cs
  36. 2
      src/AddIns/Misc/ResourceToolkit/Project/Src/Gui/UnusedResourceKeysViewContent.cs
  37. 2
      src/AddIns/Misc/StartPage/Project/Src/StartPageViewContent.cs
  38. 2
      src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/HistoryViewDisplayBinding/HistoryView.cs
  39. 2
      src/AddIns/Misc/UnitTesting/Src/UnitTestsPad.cs
  40. 2
      src/Main/Base/Project/Src/Gui/AbstractPadContent.cs
  41. 2
      src/Main/Base/Project/Src/Gui/AbstractViewContent.cs
  42. 2
      src/Main/Base/Project/Src/Gui/AbstractViewContentHandlingLoadErrors.cs
  43. 2
      src/Main/Base/Project/Src/Gui/BrowserDisplayBinding/HtmlViewPane.cs
  44. 2
      src/Main/Base/Project/Src/Gui/Dialogs/AbstractOptionPanel.cs
  45. 2
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/XmlFormsOptionPanel.cs
  46. 2
      src/Main/Base/Project/Src/Gui/Dialogs/ProjectOptionsView.cs
  47. 2
      src/Main/Base/Project/Src/Gui/Dialogs/TabbedOptions.cs
  48. 2
      src/Main/Base/Project/Src/Gui/Dialogs/TreeViewOptionsDialog.xaml.cs
  49. 2
      src/Main/Base/Project/Src/Gui/IPadContent.cs
  50. 2
      src/Main/Base/Project/Src/Gui/IViewContent.cs
  51. 2
      src/Main/Base/Project/Src/Gui/Pads/ClassBrowser/ClassBrowser.cs
  52. 4
      src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs
  53. 2
      src/Main/Base/Project/Src/Gui/Pads/DefinitionViewPad.cs
  54. 2
      src/Main/Base/Project/Src/Gui/Pads/ErrorList/ErrorListPad.cs
  55. 6
      src/Main/Base/Project/Src/Gui/Pads/FileScout.cs
  56. 2
      src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserPad.cs
  57. 2
      src/Main/Base/Project/Src/Gui/Pads/PropertyPad/PropertyPad.cs
  58. 2
      src/Main/Base/Project/Src/Gui/Pads/SearchResultPad/SearchResultPanel.cs
  59. 10
      src/Main/Base/Project/Src/Gui/Pads/TaskList/TaskListPad.cs
  60. 2
      src/Main/Base/Project/Src/Gui/Pads/ToolsPad.cs
  61. 2
      src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonPadContent.cs
  62. 12
      src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonWorkbenchWindow.cs
  63. 4
      src/Main/Base/Project/Src/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs
  64. 16
      src/Main/Base/Project/Src/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs
  65. 18
      src/Main/Base/Project/Src/Gui/Workbench/Layouts/SimpleWorkbenchLayout.cs
  66. 2
      src/Main/Base/Project/Src/Internal/Doozers/IOptionPanel.cs
  67. 29
      src/Main/Base/Project/Src/Project/AbstractProject.cs
  68. 17
      src/Main/Base/Project/Src/Project/CompilableProject.cs
  69. 50
      src/Main/Base/Project/Src/Project/IProject.cs
  70. 7
      src/Main/Base/Project/Src/Project/Solution/Solution.cs
  71. 4
      src/Main/Base/Project/Src/Services/ProjectService/CompileModifiedProjectsOnly.cs
  72. 2
      src/Main/Base/Project/Src/TextEditor/Bookmarks/Pad/BookmarkPad.cs
  73. 2
      src/Main/Base/Project/Src/TextEditor/Gui/Editor/TextEditorBasedPad.cs
  74. 2
      src/Main/Base/Project/Src/TextEditor/Gui/Editor/TextEditorDisplayBinding.cs
  75. 5
      src/Main/Base/Test/StringTagProvider/MockProjectForTagProvider.cs
  76. 2
      src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Interfaces/IEntity.cs
  77. 6
      src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/ProjectContent/DefaultProjectContent.cs
  78. 3
      src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/ProjectContent/IProjectContent.cs

2
src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonConsolePad.cs

@ -29,7 +29,7 @@ namespace ICSharpCode.PythonBinding @@ -29,7 +29,7 @@ namespace ICSharpCode.PythonBinding
host.Run();
}
public override object Content {
public override object Control {
get { return textEditorControl; }
}

5
src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockProject.cs

@ -310,6 +310,11 @@ namespace PythonBinding.Tests.Utils @@ -310,6 +310,11 @@ namespace PythonBinding.Tests.Utils
{
throw new NotImplementedException();
}
public ProjectBuildOptions CreateProjectBuildOptions(BuildOptions options, bool isRootBuildable)
{
throw new NotImplementedException();
}
#endregion
}
}

2
src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockViewContent.cs

@ -55,7 +55,7 @@ namespace PythonBinding.Tests.Utils @@ -55,7 +55,7 @@ namespace PythonBinding.Tests.Utils
get { return secondaryViewContents; }
}
public object Content {
public object Control {
get {
throw new NotImplementedException();
}

2
src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/PackageFilesView.cs

@ -31,7 +31,7 @@ namespace ICSharpCode.WixBinding @@ -31,7 +31,7 @@ namespace ICSharpCode.WixBinding
WixProject project;
bool reload;
public override object Content {
public override object Control {
get {
return packageFilesControl;
}

2
src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/SetupDialogListPad.cs

@ -45,7 +45,7 @@ namespace ICSharpCode.WixBinding @@ -45,7 +45,7 @@ namespace ICSharpCode.WixBinding
}
}
public override object Content {
public override object Control {
get {
return setupDialogListView;
}

2
src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/AvalonEditViewContent.cs

@ -43,7 +43,7 @@ namespace ICSharpCode.AvalonEdit.AddIn @@ -43,7 +43,7 @@ namespace ICSharpCode.AvalonEdit.AddIn
get { return codeEditor; }
}
public override object Content {
public override object Control {
get { return codeEditor; }
}

2
src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramCommand.cs

@ -18,7 +18,7 @@ namespace ClassDiagramAddin @@ -18,7 +18,7 @@ namespace ClassDiagramAddin
{
protected ClassCanvas Canvas
{
get { return (ClassCanvas)((ClassDiagramViewContent)this.Owner).Content; }
get { return (ClassCanvas)((ClassDiagramViewContent)this.Owner).Control; }
}
}

2
src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramViewContent.cs

@ -43,7 +43,7 @@ namespace ClassDiagramAddin @@ -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; }
}

2
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs

@ -520,7 +520,7 @@ namespace ICSharpCode.FormsDesigner @@ -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());

2
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/FormKeyHandler.cs

@ -75,7 +75,7 @@ namespace ICSharpCode.FormsDesigner @@ -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;

2
src/AddIns/DisplayBindings/HexEditor/Project/Src/View/HexEditView.cs

@ -28,7 +28,7 @@ namespace HexEditor.View @@ -28,7 +28,7 @@ namespace HexEditor.View
file.ForceInitializeView(this);
}
public override object Content {
public override object Control {
get { return hexEditContainer; }
}

2
src/AddIns/DisplayBindings/IconEditor/IconEditorAddIn/Src/IconViewContent.cs

@ -19,7 +19,7 @@ namespace ICSharpCode.IconEditorAddIn @@ -19,7 +19,7 @@ namespace ICSharpCode.IconEditorAddIn
{
EditorPanel editor = new EditorPanel();
public override object Content {
public override object Control {
get {
return editor;
}

2
src/AddIns/DisplayBindings/SettingsEditor/Project/SettingsViewContent.cs

@ -36,7 +36,7 @@ namespace ICSharpCode.SettingsEditor @@ -36,7 +36,7 @@ namespace ICSharpCode.SettingsEditor
};
}
public override object Content {
public override object Control {
get {
return view;
}

2
src/AddIns/DisplayBindings/WorkflowDesigner/Project/Src/PrimaryView/PrimaryViewContent.cs

@ -37,7 +37,7 @@ namespace WorkflowDesigner @@ -37,7 +37,7 @@ namespace WorkflowDesigner
}
public override object Content {
public override object Control {
get {
return control;
}

2
src/AddIns/DisplayBindings/WorkflowDesigner/Project/Src/SecondaryView/SecondaryViewContent.cs

@ -34,7 +34,7 @@ namespace WorkflowDesigner @@ -34,7 +34,7 @@ namespace WorkflowDesigner
#endregion
#region Property Accessors
public override object Content {
public override object Control {
get {
return control;
}

2
src/AddIns/DisplayBindings/XmlEditor/Project/Src/XPathQueryPad.cs

@ -38,7 +38,7 @@ namespace ICSharpCode.XmlEditor @@ -38,7 +38,7 @@ namespace ICSharpCode.XmlEditor
/// <summary>
/// The <see cref="System.Windows.Forms.Control"/> representing the pad.
/// </summary>
public override object Content {
public override object Control {
get {
return xPathQueryControl;
}

2
src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlTreeView.cs

@ -44,7 +44,7 @@ namespace ICSharpCode.XmlEditor @@ -44,7 +44,7 @@ namespace ICSharpCode.XmlEditor
treeViewContainer.TreeView.ContextMenuStrip = treeViewContextMenuStrip;
}
public override object Content {
public override object Control {
get {
return treeViewContainer;
}

2
src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlView.cs

@ -549,7 +549,7 @@ namespace ICSharpCode.XmlEditor @@ -549,7 +549,7 @@ namespace ICSharpCode.XmlEditor
#region AbstractViewContent implementation
public override object Content {
public override object Control {
get {
return xmlEditor;
}

2
src/AddIns/DisplayBindings/XmlEditor/Test/Tree/XmlTreeViewClipboardHandlerTestFixture.cs

@ -40,7 +40,7 @@ namespace XmlEditor.Tests.Tree @@ -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;

2
src/AddIns/Misc/AddinScout/Project/Src/AddInScoutViewContent.cs

@ -16,7 +16,7 @@ namespace AddInScout @@ -16,7 +16,7 @@ namespace AddInScout
{
Control control = null;
public override object Content {
public override object Control {
get {
return control;
}

2
src/AddIns/Misc/CodeCoverage/Project/Src/CodeCoveragePad.cs

@ -38,7 +38,7 @@ namespace ICSharpCode.CodeCoverage @@ -38,7 +38,7 @@ namespace ICSharpCode.CodeCoverage
}
}
public override object Content {
public override object Control {
get {
return codeCoverageControl;
}

2
src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Src/ComponentInspectorView.cs

@ -45,7 +45,7 @@ namespace ICSharpCode.ComponentInspector.AddIn @@ -45,7 +45,7 @@ namespace ICSharpCode.ComponentInspector.AddIn
}
}
public override object Content {
public override object Control {
get {
return objectBrowser;
}

2
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/CallStackPad.cs

@ -58,7 +58,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -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;
}

2
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LoadedModulesPad.cs

@ -59,7 +59,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -59,7 +59,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
ColumnHeader information = new ColumnHeader();
public override object Content {
public override object Control {
get {
return loadedModulesList;
}

2
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LocalVarPad.cs

@ -70,7 +70,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -70,7 +70,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
/// <remarks>
/// This is not used anywhere, but it is neccessary to be overridden in children of AbstractPadContent.
/// </remarks>
public override object Content {
public override object Control {
get {
return localVarList;
}

2
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/RunningThreadsPad.cs

@ -59,7 +59,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -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;
}

2
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/WatchPad.cs

@ -134,7 +134,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -134,7 +134,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
/// <remarks>
/// This is not used anywhere, but it is neccessary to be overridden in children of AbstractPadContent.
/// </remarks>
public override object Content {
public override object Control {
get {
return watchList;
}

14
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/WatchPadCommands.cs

@ -17,7 +17,7 @@ namespace Debugger.AddIn @@ -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 @@ -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 @@ -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();
}
}
}

2
src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/DynamicHelpPad.cs

@ -43,7 +43,7 @@ namespace HtmlHelp2 @@ -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; }
}

2
src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexPad.cs

@ -33,7 +33,7 @@ namespace HtmlHelp2 @@ -33,7 +33,7 @@ namespace HtmlHelp2
{
MSHelp2IndexControl help2IndexControl;
public override object Content
public override object Control
{
get { return help2IndexControl; }
}

2
src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexResultsPad.cs

@ -32,7 +32,7 @@ namespace HtmlHelp2 @@ -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; }
}

2
src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/SearchPad.cs

@ -47,7 +47,7 @@ namespace HtmlHelp2 @@ -47,7 +47,7 @@ namespace HtmlHelp2
Label label2 = new Label();
bool searchIsBusy;
public override object Content
public override object Control
{
get { return mainPanel; }
}

2
src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/TocPad.cs

@ -34,7 +34,7 @@ namespace HtmlHelp2 @@ -34,7 +34,7 @@ namespace HtmlHelp2
{
MSHelp2TocControl help2TocControl;
public override object Content
public override object Control
{
get { return help2TocControl; }
}

2
src/AddIns/Misc/Profiler/Frontend/AddIn/Src/OptionsPanels/General.cs

@ -31,7 +31,7 @@ namespace ICSharpCode.Profiler.AddIn.OptionsPanels @@ -31,7 +31,7 @@ namespace ICSharpCode.Profiler.AddIn.OptionsPanels
panel = new GeneralOptionsPanel();
}
public override object Content {
public override object Control {
get {
return panel;
}

5
src/AddIns/Misc/Profiler/Frontend/AddIn/Src/Views/WpfViewer.cs

@ -27,10 +27,7 @@ namespace ICSharpCode.Profiler.AddIn.Views @@ -27,10 +27,7 @@ namespace ICSharpCode.Profiler.AddIn.Views
ProfilingDataProvider provider;
ProfilerView dataView;
/// <summary>
/// The <see cref="System.Windows.Forms.Control"/> representing the view
/// </summary>
public override object Content {
public override object Control {
get {
return dataView;
}

2
src/AddIns/Misc/ResourceToolkit/Project/Src/Gui/UnusedResourceKeysViewContent.cs

@ -28,7 +28,7 @@ namespace Hornung.ResourceToolkit.Gui @@ -28,7 +28,7 @@ namespace Hornung.ResourceToolkit.Gui
ListView listView;
ToolStrip toolStrip;
public override object Content {
public override object Control {
get {
return this.panel;
}

2
src/AddIns/Misc/StartPage/Project/Src/StartPageViewContent.cs

@ -15,7 +15,7 @@ namespace ICSharpCode.StartPage @@ -15,7 +15,7 @@ namespace ICSharpCode.StartPage
{
StartPageControl content = new StartPageControl();
public override object Content {
public override object Control {
get {
return content;
}

2
src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/HistoryViewDisplayBinding/HistoryView.cs

@ -15,7 +15,7 @@ namespace ICSharpCode.Svn @@ -15,7 +15,7 @@ namespace ICSharpCode.Svn
{
HistoryViewPanel historyViewPanel;
public override object Content {
public override object Control {
get {
return historyViewPanel;
}

2
src/AddIns/Misc/UnitTesting/Src/UnitTestsPad.cs

@ -73,7 +73,7 @@ namespace ICSharpCode.UnitTesting @@ -73,7 +73,7 @@ namespace ICSharpCode.UnitTesting
}
}
public override object Content {
public override object Control {
get {
return panel;
}

2
src/Main/Base/Project/Src/Gui/AbstractPadContent.cs

@ -12,7 +12,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -12,7 +12,7 @@ namespace ICSharpCode.SharpDevelop.Gui
{
public abstract class AbstractPadContent : IPadContent
{
public abstract object Content {
public abstract object Control {
get;
}

2
src/Main/Base/Project/Src/Gui/AbstractViewContent.cs

@ -45,7 +45,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -45,7 +45,7 @@ namespace ICSharpCode.SharpDevelop.Gui
this.Files.Add(file);
}
public abstract object Content {
public abstract object Control {
get;
}

2
src/Main/Base/Project/Src/Gui/AbstractViewContentHandlingLoadErrors.cs

@ -40,7 +40,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -40,7 +40,7 @@ namespace ICSharpCode.SharpDevelop.Gui
{
}
public sealed override object Content {
public sealed override object Control {
get { return contentControl; }
}

2
src/Main/Base/Project/Src/Gui/BrowserDisplayBinding/HtmlViewPane.cs

@ -26,7 +26,7 @@ namespace ICSharpCode.SharpDevelop.BrowserDisplayBinding @@ -26,7 +26,7 @@ namespace ICSharpCode.SharpDevelop.BrowserDisplayBinding
}
}
public override object Content {
public override object Control {
get {
return htmlViewPane;
}

2
src/Main/Base/Project/Src/Gui/Dialogs/AbstractOptionPanel.cs

@ -13,7 +13,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -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();
}

2
src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/XmlFormsOptionPanel.cs

@ -18,7 +18,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels @@ -18,7 +18,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
{
public object Owner { get; set; }
public object Content {
public object Control {
get {
return this;
}

2
src/Main/Base/Project/Src/Gui/Dialogs/ProjectOptionsView.cs

@ -29,7 +29,7 @@ namespace ICSharpCode.SharpDevelop.Project.Dialogs @@ -29,7 +29,7 @@ namespace ICSharpCode.SharpDevelop.Project.Dialogs
}
}
public override object Content {
public override object Control {
get {
return tabControl;
}

2
src/Main/Base/Project/Src/Gui/Dialogs/TabbedOptions.cs

@ -110,7 +110,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -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);
}
}
}

2
src/Main/Base/Project/Src/Gui/Dialogs/TreeViewOptionsDialog.xaml.cs

@ -114,7 +114,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -114,7 +114,7 @@ namespace ICSharpCode.SharpDevelop.Gui
optionPanel.LoadOptions();
dialog.optionPanels.Add(optionPanel);
}
return optionPanel.Content;
return optionPanel.Control;
}
}

2
src/Main/Base/Project/Src/Gui/IPadContent.cs

@ -20,7 +20,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -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.
/// </summary>
object Content {
object Control {
get;
}
}

2
src/Main/Base/Project/Src/Gui/IViewContent.cs

@ -41,7 +41,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -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.
/// </summary>
object Content {
object Control {
get;
}

2
src/Main/Base/Project/Src/Gui/Pads/ClassBrowser/ClassBrowser.cs

@ -59,7 +59,7 @@ namespace ICSharpCode.SharpDevelop.Gui.ClassBrowser @@ -59,7 +59,7 @@ namespace ICSharpCode.SharpDevelop.Gui.ClassBrowser
}
}
public override object Content {
public override object Control {
get {
return contentPanel;
}

4
src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs

@ -108,7 +108,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -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 @@ -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

2
src/Main/Base/Project/Src/Gui/Pads/DefinitionViewPad.cs

@ -25,7 +25,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -25,7 +25,7 @@ namespace ICSharpCode.SharpDevelop.Gui
/// <summary>
/// The <see cref="System.Windows.Forms.Control"/> representing the pad
/// </summary>
public override object Content {
public override object Control {
get {
return ctl;
}

2
src/Main/Base/Project/Src/Gui/Pads/ErrorList/ErrorListPad.cs

@ -67,7 +67,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -67,7 +67,7 @@ namespace ICSharpCode.SharpDevelop.Gui
}
}
public override object Content {
public override object Control {
get {
return contentPanel;
}

6
src/Main/Base/Project/Src/Gui/Pads/FileScout.cs

@ -325,16 +325,12 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -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();

2
src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserPad.cs

@ -63,7 +63,7 @@ namespace ICSharpCode.SharpDevelop.Project @@ -63,7 +63,7 @@ namespace ICSharpCode.SharpDevelop.Project
}
}
public override object Content {
public override object Control {
get {
return projectBrowserPanel;
}

2
src/Main/Base/Project/Src/Gui/Pads/PropertyPad/PropertyPad.cs

@ -120,7 +120,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -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;
}

2
src/Main/Base/Project/Src/Gui/Pads/SearchResultPad/SearchResultPanel.cs

@ -50,7 +50,7 @@ namespace SearchAndReplace @@ -50,7 +50,7 @@ namespace SearchAndReplace
string curPattern = null;
IList<SearchResultMatch> curResults = null;
public override object Content {
public override object Control {
get {
return myPanel;
}

10
src/Main/Base/Project/Src/Gui/Pads/TaskList/TaskListPad.cs

@ -46,7 +46,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -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 @@ -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 @@ -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);
}

2
src/Main/Base/Project/Src/Gui/Pads/ToolsPad.cs

@ -29,7 +29,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -29,7 +29,7 @@ namespace ICSharpCode.SharpDevelop.Gui
{
ContentControl contentControl = new ContentControl();
public override object Content {
public override object Control {
get {
return contentControl;
}

2
src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonPadContent.cs

@ -52,7 +52,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -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;
}
}

12
src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonWorkbenchWindow.cs

@ -120,7 +120,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -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 @@ -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 @@ -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 @@ -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();

4
src/Main/Base/Project/Src/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs

@ -389,7 +389,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -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 @@ -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);

16
src/Main/Base/Project/Src/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs

@ -123,9 +123,9 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -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 @@ -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 @@ -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 @@ -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();

18
src/Main/Base/Project/Src/Gui/Workbench/Layouts/SimpleWorkbenchLayout.cs

@ -90,7 +90,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -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 @@ -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 @@ -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 @@ -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 @@ -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();

2
src/Main/Base/Project/Src/Internal/Doozers/IOptionPanel.cs

@ -18,7 +18,7 @@ namespace ICSharpCode.SharpDevelop @@ -18,7 +18,7 @@ namespace ICSharpCode.SharpDevelop
/// </summary>
object Owner { get; set; }
object Content {
object Control {
get;
}

29
src/Main/Base/Project/Src/Project/AbstractProject.cs

@ -513,5 +513,34 @@ namespace ICSharpCode.SharpDevelop.Project @@ -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;
}
}
}

17
src/Main/Base/Project/Src/Project/CompilableProject.cs

@ -231,23 +231,6 @@ namespace ICSharpCode.SharpDevelop.Project @@ -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);
}
}
/// <summary>
/// Creates a <see cref="ProcessStartInfo"/> for the specified program, using
/// arguments and working directory from the project options.

50
src/Main/Base/Project/Src/Project/IProject.cs

@ -280,60 +280,18 @@ namespace ICSharpCode.SharpDevelop.Project @@ -280,60 +280,18 @@ namespace ICSharpCode.SharpDevelop.Project
/// Gets the parent solution.
/// </summary>
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
{
/// <summary>
/// Creates the project-specific build options.
/// </summary>
/// <param name="options">The global build options.</param>
/// <param name="isRootBuildable">Specifies whether this project is the main buildable item
/// (i.e. the ).</param>
/// <param name="isRootBuildable">Specifies whether this project is the main buildable item.
/// The root buildable is the buildable for which <see cref="BuildOptions.ProjectTarget"/> and <see cref="BuildOptions.ProjectAdditionalProperties"/> apply.
/// The dependencies of that root buildable are the non-root buildables.</param>
/// <returns>The project-specific build options.</returns>
ProjectBuildOptions CreateProjectBuildOptions(BuildOptions options, bool isRootBuildable);
}
/// <summary>
/// Provides the IBuildable2 methods in IBuildable.
/// For classes not implementing IBuildable2, a default implementation is used.
/// </summary>
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;
}
}
/// <summary>
/// Interface for adding and removing items from a project. Not part of the IProject
/// interface because in nearly all cases, ProjectService.Add/RemoveProjectItem should

7
src/Main/Base/Project/Src/Project/Solution/Solution.cs

@ -770,7 +770,7 @@ namespace ICSharpCode.SharpDevelop.Project @@ -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 @@ -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()

4
src/Main/Base/Project/Src/Services/ProjectService/CompileModifiedProjectsOnly.cs

@ -118,7 +118,7 @@ namespace ICSharpCode.SharpDevelop.Project @@ -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 @@ -183,7 +183,7 @@ namespace ICSharpCode.SharpDevelop.Project
}
}
sealed class Wrapper : IBuildable2
sealed class Wrapper : IBuildable
{
internal readonly IBuildable wrapped;
internal readonly WrapperFactory factory;

2
src/Main/Base/Project/Src/TextEditor/Bookmarks/Pad/BookmarkPad.cs

@ -40,7 +40,7 @@ namespace ICSharpCode.SharpDevelop.Bookmarks @@ -40,7 +40,7 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
Dictionary<string, BookmarkFolderNode> fileNodes = new Dictionary<string, BookmarkFolderNode>();
public override object Content {
public override object Control {
get {
return myPanel;
}

2
src/Main/Base/Project/Src/TextEditor/Gui/Editor/TextEditorBasedPad.cs

@ -30,7 +30,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor @@ -30,7 +30,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
}
}
public override object Content {
public override object Control {
get { return this.TextEditorControl; }
}

2
src/Main/Base/Project/Src/TextEditor/Gui/Editor/TextEditorDisplayBinding.cs

@ -142,7 +142,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor @@ -142,7 +142,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
}
}
public override object Content {
public override object Control {
get {
return textEditorControl;
}

5
src/Main/Base/Test/StringTagProvider/MockProjectForTagProvider.cs

@ -260,6 +260,11 @@ namespace ICSharpCode.SharpDevelop.Tests.StringTagProvider @@ -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();

2
src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Interfaces/IEntity.cs

@ -108,10 +108,12 @@ namespace ICSharpCode.SharpDevelop.Dom @@ -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;
}

6
src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/ProjectContent/DefaultProjectContent.cs

@ -748,12 +748,6 @@ namespace ICSharpCode.SharpDevelop.Dom @@ -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)

3
src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/ProjectContent/IProjectContent.cs

@ -96,9 +96,6 @@ namespace ICSharpCode.SharpDevelop.Dom @@ -96,9 +96,6 @@ namespace ICSharpCode.SharpDevelop.Dom
/// </summary>
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);
/// <summary>

Loading…
Cancel
Save