diff options
Diffstat (limited to 'main')
16 files changed, 42 insertions, 132 deletions
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs index 3f469ff909..40930f4b0d 100644 --- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs +++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs @@ -357,12 +357,12 @@ namespace MonoDevelop.Gettext } #endregion - public Gtk.Menu CreateOptionsMenu () + public Menu CreateOptionsMenu () { - Gtk.Menu menu = new Gtk.Menu (); + Menu menu = new Menu (); MenuItem searchInMenu = new MenuItem (GettextCatalog.GetString ("_Search in")); - Gtk.Menu sub = new Gtk.Menu (); + Menu sub = new Menu (); searchInMenu.Submenu = sub; Gtk.RadioMenuItem original = null, translated = null, both = null; GLib.SList group = new GLib.SList (IntPtr.Zero); diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs index fb49ba7a7a..c6fd94461b 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs @@ -462,9 +462,9 @@ namespace MonoDevelop.CodeActions } #endif - static Gtk.Menu CreateGtkMenu (FixMenuDescriptor entrySet) + static Menu CreateGtkMenu (FixMenuDescriptor entrySet) { - var menu = new Gtk.Menu (); + var menu = new Menu (); foreach (var item in entrySet.Items) { if (item == FixMenuEntry.Separator) { menu.Add (new SeparatorMenuItem ()); diff --git a/main/src/addins/Xml/Editor/BaseXmlEditorExtension.cs b/main/src/addins/Xml/Editor/BaseXmlEditorExtension.cs index 977eddecf1..de58b78d86 100644 --- a/main/src/addins/Xml/Editor/BaseXmlEditorExtension.cs +++ b/main/src/addins/Xml/Editor/BaseXmlEditorExtension.cs @@ -717,7 +717,7 @@ namespace MonoDevelop.Xml.Editor } else { if (ownerProjects.Count > 1) index--; - var menu = new Gtk.Menu (); + var menu = new Menu (); var mi = new MenuItem (GettextCatalog.GetString ("Select")); mi.Activated += delegate { SelectPath (index); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs index afbc654b2d..a2e6d77062 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs @@ -141,7 +141,7 @@ namespace MonoDevelop.Components.Commands /// <summary> /// Creates a menu from the provided extension path /// </summary> - public Menu CreateMenu (string addinPath) + public Gtk.Menu CreateMenu (string addinPath) { CommandEntrySet cset = CreateCommandEntrySet (addinPath); return CreateMenu (cset); @@ -159,7 +159,7 @@ namespace MonoDevelop.Components.Commands /// <param name='addinPath'> /// Extension path to the definition of the menu /// </param> - public void ShowContextMenu (Control parent, ButtonEvent evt, string addinPath) + public void ShowContextMenu (Gtk.Widget parent, Gdk.EventButton evt, string addinPath) { ShowContextMenu (parent, evt, CreateCommandEntrySet (addinPath)); } @@ -179,7 +179,7 @@ namespace MonoDevelop.Components.Commands /// <param name='addinPath'> /// Extension path to the definition of the menu /// </param> - public void ShowContextMenu (Control parent, ButtonEvent evt, + public void ShowContextMenu (Gtk.Widget parent, Gdk.EventButton evt, ExtensionContext ctx, string addinPath) { ShowContextMenu (parent, evt, CreateCommandEntrySet (ctx, addinPath)); @@ -698,7 +698,7 @@ namespace MonoDevelop.Components.Commands /// <param name='menu'> /// The menu where to add the commands /// </param> - internal Menu CreateMenu (CommandEntrySet entrySet, CommandMenu menu) + internal Gtk.Menu CreateMenu (CommandEntrySet entrySet, CommandMenu menu) { foreach (CommandEntry entry in entrySet) { Gtk.MenuItem mi = entry.CreateMenuItem (this); @@ -772,7 +772,7 @@ namespace MonoDevelop.Components.Commands /// <param name='entrySet'> /// Entry with the command definitions /// </param> - public Menu CreateMenu (CommandEntrySet entrySet) + public Gtk.Menu CreateMenu (CommandEntrySet entrySet) { return CreateMenu (entrySet, new CommandMenu (this)); } @@ -789,7 +789,7 @@ namespace MonoDevelop.Components.Commands /// <param name='closeHandler'> /// EventHandler to be run when the menu closes /// </param> - public Menu CreateMenu (CommandEntrySet entrySet, EventHandler closeHandler) + public Gtk.Menu CreateMenu (CommandEntrySet entrySet, EventHandler closeHandler) { return CreateMenu (entrySet, new CommandMenu (this), closeHandler); } @@ -806,7 +806,7 @@ namespace MonoDevelop.Components.Commands /// <param name='initialTarget'> /// Initial command route target. The command handler will start looking for command handlers in this object. /// </param> - public Menu CreateMenu (CommandEntrySet entrySet, object initialTarget) + public Gtk.Menu CreateMenu (CommandEntrySet entrySet, object initialTarget) { return CreateMenu (entrySet, initialTarget, null); } @@ -826,7 +826,7 @@ namespace MonoDevelop.Components.Commands /// <param name='closeHandler'> /// EventHandler to be run when the menu closes /// </param> - public Menu CreateMenu (CommandEntrySet entrySet, object initialTarget, EventHandler closeHandler) + public Gtk.Menu CreateMenu (CommandEntrySet entrySet, object initialTarget, EventHandler closeHandler) { var menu = (CommandMenu) CreateMenu (entrySet, new CommandMenu (this)); menu.InitialCommandTarget = initialTarget; @@ -851,7 +851,7 @@ namespace MonoDevelop.Components.Commands /// <param name='initialCommandTarget'> /// Initial command route target. The command handler will start looking for command handlers in this object. /// </param> - public bool ShowContextMenu (Control parent, ButtonEvent evt, CommandEntrySet entrySet, + public bool ShowContextMenu (Gtk.Widget parent, Gdk.EventButton evt, CommandEntrySet entrySet, object initialCommandTarget = null) { return ShowContextMenu (parent, evt, entrySet, initialCommandTarget, null); @@ -875,7 +875,7 @@ namespace MonoDevelop.Components.Commands /// <param name='closeHandler'> /// An event handler which will be called when the menu closes /// </param> - public bool ShowContextMenu (Control parent, ButtonEvent evt, CommandEntrySet entrySet, + public bool ShowContextMenu (Gtk.Widget parent, Gdk.EventButton evt, CommandEntrySet entrySet, object initialCommandTarget, EventHandler closeHandler) { #if MAC @@ -898,7 +898,7 @@ namespace MonoDevelop.Components.Commands /// <param name="y">The y coordinate.</param> /// <param name="entrySet">Entry set with the command definitions</param> /// <param name="initialCommandTarget">Initial command target.</param> - public bool ShowContextMenu (Control parent, int x, int y, CommandEntrySet entrySet, + public bool ShowContextMenu (Gtk.Widget parent, int x, int y, CommandEntrySet entrySet, object initialCommandTarget = null) { #if MAC @@ -928,20 +928,20 @@ namespace MonoDevelop.Components.Commands /// <param name='initialCommandTarget'> /// Initial command route target. The command handler will start looking for command handlers in this object. /// </param> - public void ShowContextMenu (Control parent, ButtonEvent evt, Menu menu, + public void ShowContextMenu (Gtk.Widget parent, Gdk.EventButton evt, Gtk.Menu menu, object initialCommandTarget = null) { - if (menu.GetNativeWidget<Gtk.Menu> () is CommandMenu) { + if (menu is CommandMenu) { ((CommandMenu)menu).InitialCommandTarget = initialCommandTarget ?? parent; } MonoDevelop.Components.GtkWorkarounds.ShowContextMenu (menu, parent, evt); } - public void ShowContextMenu (Control parent, int x, int y, Menu menu, + public void ShowContextMenu (Gtk.Widget parent, int x, int y, Gtk.Menu menu, object initialCommandTarget = null) { - if (menu.GetNativeWidget<Gtk.Menu> () is CommandMenu) { + if (menu is CommandMenu) { ((CommandMenu)menu).InitialCommandTarget = initialCommandTarget ?? parent; } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ContextMenuExtensionsMac.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ContextMenuExtensionsMac.cs index c09ce3b789..3fd766ba13 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ContextMenuExtensionsMac.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ContextMenuExtensionsMac.cs @@ -90,11 +90,10 @@ namespace MonoDevelop.Components }); } - public static void ShowContextMenu (Control parentControl, Gdk.EventButton evt, NSMenu menu) + public static void ShowContextMenu (Gtk.Widget parent, Gdk.EventButton evt, NSMenu menu) { int x, y; - Gtk.Widget parent = parentControl; parent.TranslateCoordinates (parent.Toplevel, (int)evt.X, (int)evt.Y, out x, out y); ShowContextMenu (parent, x, y, menu); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Menu.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Menu.cs deleted file mode 100644 index dbce67970a..0000000000 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Menu.cs +++ /dev/null @@ -1,88 +0,0 @@ -// -// Menu.cs -// -// Author: -// therzok <marius.ungureanu@xamarin.com> -// -// Copyright (c) 2015 (c) Marius Ungureanu -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// -// Window.cs -// -// Author: -// therzok <marius.ungureanu@xamarin.com> -// -// Copyright (c) 2015 therzok -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -using System; - -namespace MonoDevelop.Components -{ - public class Menu : Control - { - object widget; - public Menu (object widget) - { - this.widget = widget; - } - - protected override object CreateNativeWidget () - { - return widget; - } - - protected override void Dispose (bool disposing) - { - widget = null; - base.Dispose (disposing); - } - - public static implicit operator Gtk.Menu (Menu d) - { - return d.GetNativeWidget<Gtk.Menu> (); - } - - public static implicit operator Menu (Gtk.Menu d) - { - if (d == null) - return null; - - return (Menu)(Control)d; - } - } -} - diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/MenuButton.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/MenuButton.cs index 87ca8aa151..50443ef77c 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/MenuButton.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/MenuButton.cs @@ -109,7 +109,7 @@ namespace MonoDevelop.Components } if (creator != null) { - Gtk.Menu menu = creator (this); + Menu menu = creator (this); if (menu != null) { var oldRelief = MenuOpened (); @@ -140,7 +140,7 @@ namespace MonoDevelop.Components this.State = StateType.Active; } - void PositionFunc (Gtk.Menu mn, out int x, out int y, out bool push_in) + void PositionFunc (Menu mn, out int x, out int y, out bool push_in) { this.GdkWindow.GetOrigin (out x, out y); Gdk.Rectangle rect = this.Allocation; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/MenuButtonEntry.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/MenuButtonEntry.cs index 2da369e69e..7f4c967b18 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/MenuButtonEntry.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/MenuButtonEntry.cs @@ -119,7 +119,7 @@ namespace MonoDevelop.Components public void ShowQuickInsertMenu (object sender, EventArgs args) { - Gtk.Menu menu = manager.CreateMenu (entrySet); + var menu = manager.CreateMenu (entrySet); //FIXME: taken from MonoDevelop.Components.MenuButton. should share this. diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PathBar.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PathBar.cs index d5bd97e444..b80c336e4f 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PathBar.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PathBar.cs @@ -475,7 +475,7 @@ namespace MonoDevelop.Components }; menuVisible = true; if (menuWidget is Menu) { - ((Gtk.Menu)menuWidget).Popup (null, null, PositionFunc, 0, Gtk.Global.CurrentEventTime); + ((Menu)menuWidget).Popup (null, null, PositionFunc, 0, Gtk.Global.CurrentEventTime); } else { var window = menuWidget as Gtk.Window; PositionWidget (menuWidget); @@ -553,7 +553,7 @@ namespace MonoDevelop.Components - void PositionFunc (Gtk.Menu mn, out int x, out int y, out bool push_in) + void PositionFunc (Menu mn, out int x, out int y, out bool push_in) { this.GdkWindow.GetOrigin (out x, out y); int w; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SearchEntry.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SearchEntry.cs index 65d5b0d20b..188f400dd3 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SearchEntry.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SearchEntry.cs @@ -44,7 +44,7 @@ namespace MonoDevelop.Components private HoverImageButton filter_button; private HoverImageButton clear_button; - private Gtk.Menu menu; + private Menu menu; private int active_filter_id = -1; private uint changed_timeout_id = 0; @@ -85,7 +85,7 @@ namespace MonoDevelop.Components } } - public Gtk.Menu Menu { + public Menu Menu { get { return menu; } set { menu = value; menu.Deactivated += OnMenuDeactivated; } } @@ -209,7 +209,7 @@ namespace MonoDevelop.Components private void BuildMenu () { - menu = new Gtk.Menu (); + menu = new Menu (); menu.Deactivated += OnMenuDeactivated; } @@ -236,7 +236,7 @@ namespace MonoDevelop.Components entryAlignment.LeftPadding = (uint) (!filter_button.Visible && roundedShape ? 6 : 0); } - private void OnPositionMenu (Gtk.Menu menu, out int x, out int y, out bool push_in) + private void OnPositionMenu (Menu menu, out int x, out int y, out bool push_in) { int origin_x, origin_y, tmp; 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 4662f45b07..0c42fa9d38 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 @@ -120,7 +120,7 @@ namespace MonoDevelop.Ide.Gui.Dialogs for (uint n=0; n < TextEncoding.ConversionEncodings.Length; n++) { if (TextEncoding.ConversionEncodings [n].CodePage == value) { encodingMenu.SetHistory (n + (uint)firstEncIndex); - Gtk.Menu menu = (Gtk.Menu)encodingMenu.Menu; + Menu menu = (Menu)encodingMenu.Menu; RadioMenuItem rm = (RadioMenuItem) menu.Children [n + firstEncIndex]; rm.Active = true; return; @@ -149,7 +149,7 @@ namespace MonoDevelop.Ide.Gui.Dialogs selectOption = -1; RadioMenuItem defaultActivated = null; - Gtk.Menu menu = new Gtk.Menu (); + Gtk.Menu menu = new Menu (); // Don't show the auto-detection option when saving diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/ErrorListPad.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/ErrorListPad.cs index 1eb034bdcf..b99fa3753c 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/ErrorListPad.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/ErrorListPad.cs @@ -71,7 +71,7 @@ namespace MonoDevelop.Ide.Gui.Pads int infoCount; bool initialLogShow = true; - Gtk.Menu menu; + Menu menu; Dictionary<ToggleAction, int> columnsActions = new Dictionary<ToggleAction, int> (); Clipboard clipboard; @@ -413,7 +413,7 @@ namespace MonoDevelop.Ide.Gui.Pads + "</popup></ui>"; uiManager.AddUiFromString (uiStr); - menu = (Gtk.Menu)uiManager.GetWidget ("/popup"); + menu = (Menu)uiManager.GetWidget ("/popup"); menu.ShowAll (); menu.Shown += delegate { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs index 09973a0c4a..ab57d7ed37 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs @@ -284,7 +284,7 @@ namespace MonoDevelop.Ide.Gui void CreateMenuBar () { topMenu = IdeApp.CommandService.CreateMenuBar (mainMenuPath); - Gtk.Menu appMenu = IdeApp.CommandService.CreateMenu (appMenuPath); + var appMenu = IdeApp.CommandService.CreateMenu (appMenuPath); if (appMenu != null && appMenu.Children.Length > 0) { var item = new MenuItem (BrandingService.ApplicationName); item.Submenu = appMenu; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkNewProjectDialogBackend.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkNewProjectDialogBackend.cs index 16c9af56ab..5a7a83dad9 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkNewProjectDialogBackend.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkNewProjectDialogBackend.cs @@ -38,7 +38,7 @@ namespace MonoDevelop.Ide.Projects partial class GtkNewProjectDialogBackend : INewProjectDialogBackend
{
INewProjectDialogController controller;
- Gtk.Menu popupMenu;
+ Menu popupMenu;
public GtkNewProjectDialogBackend ()
{
@@ -114,7 +114,7 @@ namespace MonoDevelop.Ide.Projects if (templateTextRenderer.IsLanguageButtonPressed (args.Event)) {
if (popupMenu == null) {
- popupMenu = new Gtk.Menu ();
+ popupMenu = new Menu ();
popupMenu.AttachToWidget (this, null);
}
ClearPopupMenuItems ();
@@ -122,7 +122,7 @@ namespace MonoDevelop.Ide.Projects popupMenu.ModifyBg (StateType.Normal, GtkTemplateCellRenderer.LanguageButtonBackgroundColor);
popupMenu.ShowAll ();
- MenuPositionFunc posFunc = (Gtk.Menu m, out int x, out int y, out bool pushIn) => {
+ MenuPositionFunc posFunc = (Menu m, out int x, out int y, out bool pushIn) => {
Gdk.Rectangle rect = templateTextRenderer.GetLanguageRect ();
Gdk.Rectangle screenRect = GtkUtil.ToScreenCoordinates (templatesTreeView, templatesTreeView.GdkWindow, rect);
x = screenRect.X;
@@ -140,7 +140,7 @@ namespace MonoDevelop.Ide.Projects }
}
- void AddLanguageMenuItems (Gtk.Menu menu, SolutionTemplate template)
+ void AddLanguageMenuItems (Menu menu, SolutionTemplate template)
{
foreach (string language in template.AvailableLanguages.OrderBy (item => item)) {
var menuItem = new MenuItem (language);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksView.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksView.cs index 13bc4ea94c..3249470dcb 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksView.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksView.cs @@ -403,7 +403,7 @@ namespace MonoDevelop.Ide.Tasks return TreeIter.Zero; } - Gtk.Menu CreateMenu () + Menu CreateMenu () { var group = new ActionGroup ("Popup"); @@ -466,7 +466,7 @@ namespace MonoDevelop.Ide.Tasks + "</popup></ui>"; uiManager.AddUiFromString (uiStr); - var menu = (Gtk.Menu)uiManager.GetWidget ("/popup"); + var menu = (Menu)uiManager.GetWidget ("/popup"); menu.ShowAll (); menu.Shown += delegate (object o, EventArgs args) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj index 5b536dac26..77638143a7 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj @@ -3507,7 +3507,6 @@ <Compile Include="MonoDevelop.Components\ButtonEvent.cs" /> <Compile Include="MonoDevelop.Components\Window.cs" /> <Compile Include="MonoDevelop.Components\Dialog.cs" /> - <Compile Include="MonoDevelop.Components\Menu.cs" /> </ItemGroup> <ItemGroup> <None Include="Makefile.am" /> |