diff options
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs | 30 |
1 files changed, 15 insertions, 15 deletions
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; } |