[Gettext] Port to context menu API

1 files changed, 38 insertions, 12 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 b45dfefa45..4871063aff 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs
@@ -96,6 +96,15 @@ namespace MonoDevelop.Gettext
 		{
 			this.project = project;
 			this.Build ();
+			
+			//FIXME: avoid unnecessary creation of old treeview
+			scrolledwindow1.Remove (treeviewEntries);
+			treeviewEntries.Destroy ();
+			treeviewEntries = new ContextMenuTreeView ();
+			treeviewEntries.ShowAll ();
+			scrolledwindow1.Add (treeviewEntries);
+			((ContextMenuTreeView)treeviewEntries).DoPopupMenu = ShowPopup;
+			
 			this.headersEditor = new CatalogHeadersWidget ();
 			this.notebookPages.AppendPage (headersEditor, new Gtk.Label ());
 			
@@ -221,15 +230,6 @@ namespace MonoDevelop.Gettext
 				UpdateProgressBar ();
 			};
 			
-			this.treeviewEntries.PopupMenu += delegate {
-				ShowPopup ();
-			};
-			
-			this.treeviewEntries.ButtonReleaseEvent += delegate(object sender, Gtk.ButtonReleaseEventArgs e) {
-				if (e.Event.Button == 3)
-					ShowPopup ();
-			};
-			
 			searchEntryFilter.Ready = true;
 			searchEntryFilter.Visible = true;
 			searchEntryFilter.ForceFilterButtonVisible = true;
@@ -519,11 +519,11 @@ namespace MonoDevelop.Gettext
 			this.notebookTranslated.AppendPage (window, label);
 		}
 		
-		void ShowPopup ()
+		void ShowPopup (EventButton evt)
 		{
 			Gtk.Menu contextMenu = CreateContextMenu ();
 			if (contextMenu != null)
-				contextMenu.Popup ();
+				GtkWorkarounds.ShowContextMenu (contextMenu, this, evt);
 		}
 		
 		Gtk.Menu CreateContextMenu ()
@@ -1287,5 +1287,31 @@ namespace MonoDevelop.Gettext
 			}
 		}
 		#endregion
+		
+		class ContextMenuTreeView : Gtk.TreeView
+		{
+			public Action<Gdk.EventButton> DoPopupMenu { get; set; }
+			
+			protected override bool OnButtonPressEvent (Gdk.EventButton evnt)
+			{
+				bool res = base.OnButtonPressEvent (evnt);
+				
+				if (DoPopupMenu != null && evnt.TriggersContextMenu ()) {
+					DoPopupMenu (evnt);
+					return true;
+				}
+				
+				return res;
+			}
+			
+			protected override bool OnPopupMenu ()
+			{
+				if (DoPopupMenu != null) {
+					DoPopupMenu (null);
+					return true;
+				}
+				return base.OnPopupMenu ();
+			}
+		}
 	}
-}
+}
\ No newline at end of file