*Merge* and fix build. (Rebase attempt was disaster)

Terminal.Gui/Views/ComboBox.cs

@@ -54,12 +54,12 @@ namespace Terminal.Gui {
 				LayoutStyle = LayoutStyle.Computed,
 				ColorScheme = Colors.Dialog
 			};
-			listview.SelectedChanged += () => {
+			listview.SelectedChanged += (object sender, ListViewItemEventArgs e) => {
 				if(searchset.Count > 0)
 					SetValue (searchset [listview.SelectedItem]);
 			};
 
-			Application.OnLoad += () => {
+			Application.Loaded += (object sender, Application.ResizedEventArgs e) => {
 				// Determine if this view is hosted inside a dialog
 				for (View view = this.SuperView; view != null; view = view.SuperView) {
 					if (view is Dialog) {

UICatalog/Scenarios/ListsAndCombos.cs

@@ -35,7 +35,7 @@ namespace UICatalog.Scenarios {
 				Y = Pos.Bottom (lbListView) + 1,
 				Width = 30
 			};
-			listview.OpenSelectedItem += (object sender, EventArgs text) => lbListView.Text = items [listview.SelectedItem];
+			listview.OpenSelectedItem += (object sender, ListViewItemEventArgs e) => lbListView.Text = items [listview.SelectedItem];
 			Win.Add (lbListView, listview);
 
 			// ComboBox