diff options
7 files changed, 4 insertions, 20 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs index d532d10bc5..89f1bbc1ab 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs @@ -122,7 +122,8 @@ namespace MonoDevelop.Ide.CodeCompletion } if ((ka & KeyActions.Complete) != 0) { - bool completed = CompleteWord (); + //bool completed = + CompleteWord (); //NOTE: this passes the enter keystroke through to the editor if the current item is an exact match //if (!completed) { // CompletionWindowManager.HideWindow (); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs index 64073788c7..80ad1c79c7 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs @@ -36,7 +36,6 @@ namespace MonoDevelop.Ide.CodeTemplates [System.ComponentModel.ToolboxItem(true)] internal partial class CodeTemplatePanelWidget : Gtk.Bin { - OptionsDialog parent; List<CodeTemplate> templates; Gtk.TreeStore templateStore; CellRendererText templateCellRenderer; @@ -46,7 +45,6 @@ namespace MonoDevelop.Ide.CodeTemplates public CodeTemplatePanelWidget (OptionsDialog parent) { - this.parent = parent; this.Build(); scrolledwindow1.Child = textEditor; textEditor.ShowAll (); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/FileSelectorDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/FileSelectorDialog.cs index 558df5ca64..bfc3bbe868 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/FileSelectorDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/FileSelectorDialog.cs @@ -43,7 +43,6 @@ namespace MonoDevelop.Ide.Gui.Dialogs { class FileSelectorDialog: FileSelector { - Hashtable filterPairs; int selectOption; int firstEncIndex; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/MonodocTreePad.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/MonodocTreePad.cs index 692b3fcdd9..3bbc515b4e 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/MonodocTreePad.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/MonodocTreePad.cs @@ -111,15 +111,7 @@ namespace MonoDevelop.Ide.Gui.Pads Node n = (Node)store.GetValue (iter, 1); - //PublicUrl property only exists in Mono 2.6+ - string url; - System.Reflection.PropertyInfo pi = typeof (Node).GetProperty ("PublicUrl"); - if (pi != null) - url = (string)pi.GetValue (n, null); - else - url = n.URL; - - IdeApp.HelpOperations.ShowHelp (url); + IdeApp.HelpOperations.ShowHelp (n.PublicUrl); } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs index 87f17c2a49..a1599c004a 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs @@ -56,9 +56,7 @@ namespace MonoDevelop.Ide.Gui IWorkbenchWindow window; TextEditorExtension editorExtension; - bool closed; - bool parsing; const int ParseDelay = 600; public IWorkbenchWindow Window { @@ -373,7 +371,6 @@ namespace MonoDevelop.Ide.Gui void OnClosed (object s, EventArgs a) { - closed = true; if (parseTimeout != 0) { GLib.Source.Remove (parseTimeout); parseTimeout = 0; @@ -555,7 +552,6 @@ namespace MonoDevelop.Ide.Gui /// </returns> public ParsedDocument UpdateParseDocument () { - parsing = true; try { string currentParseFile = FileName; string currentParseText = Editor.Text; @@ -564,7 +560,6 @@ namespace MonoDevelop.Ide.Gui if (this.parsedDocument != null && !this.parsedDocument.HasErrors) this.lastErrorFreeParsedDocument = parsedDocument; } finally { - parsing = false; OnDocumentParsed (EventArgs.Empty); } return this.parsedDocument; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs index 451e965e36..1a513e58f6 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs @@ -52,7 +52,6 @@ namespace MonoDevelop.Ide.Gui TabLabel tabLabel; Widget tabPage; Notebook tabControl; - SeparatorToolItem separatorItem; string myUntitledTitle = null; string _titleHolder = ""; diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic b/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic index 1562f376ee..c2cae529d3 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <stetic-interface> <configuration> <images-root-path>..</images-root-path> |