From bf3587bd5b13420206d2d73bbafafe517c90d80b Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@expion.com>
Date: Sat, 18 Jul 2015 16:13:38 -0400
Subject: [PATCH] Tastudio - wire an instance of tastudio into Bookmark control

---
 .../tools/TAStudio/BookmarksBranchesBox.cs     |  2 ++
 .../tools/TAStudio/TAStudio.Designer.cs        | 18 +++++++++---------
 .../tools/TAStudio/TAStudio.cs                 |  1 +
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
index 88df5ccd13..e2449c4324 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
@@ -11,6 +11,8 @@ namespace BizHawk.Client.EmuHawk
 {
 	public partial class BookmarksBranchesBox : UserControl
 	{
+		public TAStudio Tastudio { get; set; }
+
 		public BookmarksBranchesBox()
 		{
 			InitializeComponent();
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
index 6884dcbaba..8956670237 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
@@ -171,7 +171,7 @@ namespace BizHawk.Client.EmuHawk
 			this.StartFromNowSeparator = new System.Windows.Forms.ToolStripSeparator();
 			this.StartNewProjectFromNowMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.groupBox1 = new System.Windows.Forms.GroupBox();
-			this.bookmarksBranchesBox1 = new BizHawk.Client.EmuHawk.BookmarksBranchesBox();
+			this.BookMarkControl = new BizHawk.Client.EmuHawk.BookmarksBranchesBox();
 			this.TASMenu.SuspendLayout();
 			this.TasStatusStrip.SuspendLayout();
 			this.MarkerContextMenu.SuspendLayout();
@@ -1347,13 +1347,13 @@ namespace BizHawk.Client.EmuHawk
 			this.groupBox1.TabStop = false;
 			this.groupBox1.Text = "Markers";
 			// 
-			// bookmarksBranchesBox1
+			// BookMarkControl
 			// 
-			this.bookmarksBranchesBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-			this.bookmarksBranchesBox1.Location = new System.Drawing.Point(302, 120);
-			this.bookmarksBranchesBox1.Name = "bookmarksBranchesBox1";
-			this.bookmarksBranchesBox1.Size = new System.Drawing.Size(204, 205);
-			this.bookmarksBranchesBox1.TabIndex = 8;
+			this.BookMarkControl.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.BookMarkControl.Location = new System.Drawing.Point(302, 120);
+			this.BookMarkControl.Name = "BookMarkControl";
+			this.BookMarkControl.Size = new System.Drawing.Size(204, 205);
+			this.BookMarkControl.TabIndex = 8;
 			// 
 			// TAStudio
 			// 
@@ -1361,7 +1361,7 @@ namespace BizHawk.Client.EmuHawk
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.ClientSize = new System.Drawing.Size(506, 576);
-			this.Controls.Add(this.bookmarksBranchesBox1);
+			this.Controls.Add(this.BookMarkControl);
 			this.Controls.Add(this.groupBox1);
 			this.Controls.Add(this.TasPlaybackBox);
 			this.Controls.Add(this.TasStatusStrip);
@@ -1533,6 +1533,6 @@ namespace BizHawk.Client.EmuHawk
 		private System.Windows.Forms.ToolStripMenuItem ScrollToMarkerToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem applyPatternToPaintedInputToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem onlyOnAutoFireColumnsToolStripMenuItem;
-		private BookmarksBranchesBox bookmarksBranchesBox1;
+		private BookmarksBranchesBox BookMarkControl;
 	}
 }
\ No newline at end of file
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index bda1d00532..bcf5c5d60d 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -77,6 +77,7 @@ namespace BizHawk.Client.EmuHawk
 			WantsToControlStopMovie = true;
 			TasPlaybackBox.Tastudio = this;
 			MarkerControl.Tastudio = this;
+			BookMarkControl.Tastudio = this;
 			MarkerControl.Emulator = this.Emulator;
 			TasView.QueryItemText += TasView_QueryItemText;
 			TasView.QueryItemBkColor += TasView_QueryItemBkColor;