Browse Source

Fixed bug that prevented VB.Net windows forms applications from compiling.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@434 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 20 years ago
parent
commit
818103f022
  1. 3
      src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/BuildOptions.cs
  2. 27
      src/AddIns/BackendBindings/VBNetBinding/Project/Src/Project/VBNetProject.cs
  3. 2
      src/Main/Base/Project/Src/Project/AbstractProject.cs
  4. 13
      src/Main/Base/Project/Src/Services/RefactoringService/RefactoringMenuBuilder.cs

3
src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/BuildOptions.cs

@ -1,4 +1,4 @@
// <file> // <file>
// <copyright see="prj:///doc/copyright.txt">2002-2005 AlphaSierraPapa</copyright> // <copyright see="prj:///doc/copyright.txt">2002-2005 AlphaSierraPapa</copyright>
// <license see="prj:///doc/license.txt">GNU General Public License</license> // <license see="prj:///doc/license.txt">GNU General Public License</license>
// <owner name="Daniel Grunwald" email="daniel@danielgrunwald.de"/> // <owner name="Daniel Grunwald" email="daniel@danielgrunwald.de"/>
@ -49,7 +49,6 @@ namespace VBNetBinding.OptionPanels
public override bool StorePanelContents() public override bool StorePanelContents()
{ {
((VBNetProject)project).RefreshMyType();
return base.StorePanelContents(); return base.StorePanelContents();
} }
} }

27
src/AddIns/BackendBindings/VBNetBinding/Project/Src/Project/VBNetProject.cs

@ -1,4 +1,4 @@
// <file> // <file>
// <copyright see="prj:///doc/copyright.txt">2002-2005 AlphaSierraPapa</copyright> // <copyright see="prj:///doc/copyright.txt">2002-2005 AlphaSierraPapa</copyright>
// <license see="prj:///doc/license.txt">GNU General Public License</license> // <license see="prj:///doc/license.txt">GNU General Public License</license>
// <owner name="none" email=""/> // <owner name="none" email=""/>
@ -35,18 +35,21 @@ namespace VBNetBinding
/// </summary> /// </summary>
public class VBNetProject : MSBuildProject public class VBNetProject : MSBuildProject
{ {
public void RefreshMyType() public override void SetProperty<T>(string configurationName, string platform, string property, T value, PropertyStorageLocation location)
{ {
switch (this.OutputType) { base.SetProperty(configurationName, platform, property, value, location);
case OutputType.WinExe: if (property == "OutputType") {
SetProperty("MyType", "WindowsForms"); switch (this.OutputType) {
break; case OutputType.WinExe:
case OutputType.Exe: base.SetProperty(configurationName, platform, "MyType", "WindowsForms", location);
SetProperty("MyType", "Console"); break;
break; case OutputType.Exe:
default: base.SetProperty(configurationName, platform, "MyType", "Console", location);
SetProperty("MyType", "Windows"); break;
break; default:
base.SetProperty(configurationName, platform, "MyType", "Windows", location);
break;
}
} }
} }

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

@ -338,7 +338,7 @@ namespace ICSharpCode.SharpDevelop.Project
SetProperty(this.Configuration, this.Platform, property, value, location); SetProperty(this.Configuration, this.Platform, property, value, location);
} }
public void SetProperty<T>(string configurationName, string platform, string property, T value, PropertyStorageLocation location) public virtual void SetProperty<T>(string configurationName, string platform, string property, T value, PropertyStorageLocation location)
{ {
string configurationKey = platform != null ? configurationName + "|" + platform : configurationName; string configurationKey = platform != null ? configurationName + "|" + platform : configurationName;
PropertyGroup pg; PropertyGroup pg;

13
src/Main/Base/Project/Src/Services/RefactoringService/RefactoringMenuBuilder.cs

@ -64,9 +64,14 @@ namespace ICSharpCode.SharpDevelop.Refactoring
if (!lineHasDefinitions) { if (!lineHasDefinitions) {
ResolveResult rr = ResolveAtCaret(textEditorControl, textArea); ResolveResult rr = ResolveAtCaret(textEditorControl, textArea);
MemberResolveResult mrr = rr as MemberResolveResult; ToolStripMenuItem item = null;
if (mrr != null) { if (rr is MemberResolveResult) {
resultItems.Add(MakeItem(mrr.ResolvedMember)); item = MakeItem(((MemberResolveResult)rr).ResolvedMember);
} else if (rr is TypeResolveResult) {
item = MakeItem(((TypeResolveResult)rr).ResolvedClass);
}
if (item != null) {
resultItems.Add(item);
} }
} }
@ -82,12 +87,14 @@ namespace ICSharpCode.SharpDevelop.Refactoring
ToolStripMenuItem MakeItem(IMember member) ToolStripMenuItem MakeItem(IMember member)
{ {
if (member == null) return null;
return MakeItem(MemberNode.Create(member), member.DeclaringType.CompilationUnit, member.Region); return MakeItem(MemberNode.Create(member), member.DeclaringType.CompilationUnit, member.Region);
} }
ToolStripMenuItem MakeItem(IClass c) ToolStripMenuItem MakeItem(IClass c)
{ {
if (c == null) return null;
return MakeItem(new ClassNode(c.ProjectContent.Project, c), c.CompilationUnit, c.Region); return MakeItem(new ClassNode(c.ProjectContent.Project, c), c.CompilationUnit, c.Region);
} }

Loading…
Cancel
Save