Browse Source

Fix build.

pull/16/merge
Matt Ward 14 years ago
parent
commit
aad8978f1a
  1. 4
      src/Main/Base/Project/Src/Editor/Commands/ClassBookmarkSubmenuBuilder.cs
  2. 2
      src/Main/Base/Project/Src/Editor/Commands/ClassMemberMenuBuilder.cs
  3. 2
      src/Main/Base/Project/Src/Editor/Commands/FindBaseClasses.cs
  4. 4
      src/Main/Base/Project/Src/Editor/Commands/FindDerivedClassesOrOverrides.cs

4
src/Main/Base/Project/Src/Editor/Commands/ClassBookmarkSubmenuBuilder.cs

@ -89,7 +89,7 @@ namespace ICSharpCode.SharpDevelop.Editor.Commands @@ -89,7 +89,7 @@ namespace ICSharpCode.SharpDevelop.Editor.Commands
item.ShortcutKeys = System.Windows.Forms.Keys.F6;
//item.Image = ClassBrowserIconService.Class.Bitmap;
item.Click += delegate {
ContextActionsHelper.MakePopupWithDerivedClasses(baseClass).OpenAtCaretAndFocus();
ContextActionsPopupHelper.MakePopupWithDerivedClasses(baseClass).OpenAtCaretAndFocus();
};
return item;
}
@ -101,7 +101,7 @@ namespace ICSharpCode.SharpDevelop.Editor.Commands @@ -101,7 +101,7 @@ namespace ICSharpCode.SharpDevelop.Editor.Commands
var item = new MenuCommand(StringParser.Parse("${res:SharpDevelop.Refactoring.FindBaseClassesCommand}"));
//item.Image = ClassBrowserIconService.Class.Bitmap;
item.Click += delegate {
ContextActionsHelper.MakePopupWithBaseClasses(@class).OpenAtCaretAndFocus();
ContextActionsPopupHelper.MakePopupWithBaseClasses(@class).OpenAtCaretAndFocus();
};
return item;
}

2
src/Main/Base/Project/Src/Editor/Commands/ClassMemberMenuBuilder.cs

@ -121,7 +121,7 @@ namespace ICSharpCode.SharpDevelop.Editor.Commands @@ -121,7 +121,7 @@ namespace ICSharpCode.SharpDevelop.Editor.Commands
//item.Image = ClassBrowserIconService.Method.Bitmap;
item.ShortcutKeys = Keys.F6;
item.Click += delegate {
ContextActionsHelper.MakePopupWithOverrides(member).OpenAtCaretAndFocus();
ContextActionsPopupHelper.MakePopupWithOverrides(member).OpenAtCaretAndFocus();
};
return item;
}

2
src/Main/Base/Project/Src/Editor/Commands/FindBaseClasses.cs

@ -18,7 +18,7 @@ namespace ICSharpCode.SharpDevelop.Editor.Commands @@ -18,7 +18,7 @@ namespace ICSharpCode.SharpDevelop.Editor.Commands
var classUnderCaret = GetClass(symbol);
if (classUnderCaret != null)
{
ContextActionsHelper.MakePopupWithBaseClasses(classUnderCaret).OpenAtCaretAndFocus();
ContextActionsPopupHelper.MakePopupWithBaseClasses(classUnderCaret).OpenAtCaretAndFocus();
return;
}
MessageService.ShowError("${res:ICSharpCode.Refactoring.NoClassUnderCursorError}");

4
src/Main/Base/Project/Src/Editor/Commands/FindDerivedClassesOrOverrides.cs

@ -18,13 +18,13 @@ namespace ICSharpCode.SharpDevelop.Editor.Commands @@ -18,13 +18,13 @@ namespace ICSharpCode.SharpDevelop.Editor.Commands
{
var classUnderCaret = GetClass(symbol);
if (classUnderCaret != null) {
ContextActionsHelper.MakePopupWithDerivedClasses(classUnderCaret).OpenAtCaretAndFocus();
ContextActionsPopupHelper.MakePopupWithDerivedClasses(classUnderCaret).OpenAtCaretAndFocus();
return;
}
var memberUnderCaret = GetMember(symbol);
if (memberUnderCaret != null && memberUnderCaret.IsOverridable)
{
ContextActionsHelper.MakePopupWithOverrides(memberUnderCaret).OpenAtCaretAndFocus();
ContextActionsPopupHelper.MakePopupWithOverrides(memberUnderCaret).OpenAtCaretAndFocus();
return;
}
MessageService.ShowError("${res:ICSharpCode.Refactoring.NoClassOrOverridableSymbolUnderCursorError}");

Loading…
Cancel
Save