Browse Source

Fixed compiler warnings

pull/2/head
Daniel Grunwald 15 years ago
parent
commit
bb227dbb21
  1. 6
      src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/AvalonEditViewContent.cs
  2. 2
      src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/ContextActionsBulbPopup.cs

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

@ -126,13 +126,13 @@ namespace ICSharpCode.AvalonEdit.AddIn @@ -126,13 +126,13 @@ namespace ICSharpCode.AvalonEdit.AddIn
}
}
bool isLoading;
//bool isLoading;
public override void Load(OpenedFile file, Stream stream)
{
if (file != PrimaryFile)
return;
isLoading = true;
//isLoading = true;
try {
BookmarksDetach();
codeEditor.PrimaryTextEditor.SyntaxHighlighting =
@ -147,7 +147,7 @@ namespace ICSharpCode.AvalonEdit.AddIn @@ -147,7 +147,7 @@ namespace ICSharpCode.AvalonEdit.AddIn
codeEditor.FileName = FileName.Create(file.FileName);
BookmarksAttach();
} finally {
isLoading = false;
//isLoading = false;
}
}

2
src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/ContextActionsBulbPopup.cs

@ -20,7 +20,7 @@ namespace ICSharpCode.SharpDevelop.Refactoring @@ -20,7 +20,7 @@ namespace ICSharpCode.SharpDevelop.Refactoring
this.ChildControl.ActionExecuted += delegate { this.Close(); };
}
private new ContextActionsBulbControl ChildControl
private ContextActionsBulbControl ChildControl
{
get { return (ContextActionsBulbControl)this.Child; }
set { this.Child = value; }

Loading…
Cancel
Save