From 19b4072346995974f719881a02781e3ec405fe27 Mon Sep 17 00:00:00 2001
From: "andres.delikat" <andres.delikat@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Sun, 7 Aug 2011 20:20:07 +0000
Subject: [PATCH] Hex Editor - refix typing in of values

---
 BizHawk.MultiClient/tools/HexEditor.cs    | 1 -
 BizHawk.MultiClient/tools/MemoryViewer.cs | 9 ++++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/BizHawk.MultiClient/tools/HexEditor.cs b/BizHawk.MultiClient/tools/HexEditor.cs
index 7a7a8d2b81..1f210b60cd 100644
--- a/BizHawk.MultiClient/tools/HexEditor.cs
+++ b/BizHawk.MultiClient/tools/HexEditor.cs
@@ -14,7 +14,6 @@ namespace BizHawk.MultiClient
 	public partial class HexEditor : Form
 	{
 		//TODO:
-		//different back color for frozen addresses
 		//Find text box - autohighlights matches, and shows total matches
 		//Users can customize background, & text colors
 		//Tool strip
diff --git a/BizHawk.MultiClient/tools/MemoryViewer.cs b/BizHawk.MultiClient/tools/MemoryViewer.cs
index c93a569957..f69a68bf5a 100644
--- a/BizHawk.MultiClient/tools/MemoryViewer.cs
+++ b/BizHawk.MultiClient/tools/MemoryViewer.cs
@@ -14,13 +14,13 @@ namespace BizHawk.MultiClient
 		//2 & 4 byte typing in
 		//show nibbles on top of highlighted address
 		//Multi-highlight
+		//different back color for frozen addresses
 
 		public VScrollBar vScrollBar1;
 		public Label info;
 		MemoryDomain Domain = new MemoryDomain("NULL", 1024, Endian.Little, addr => { return 0; }, (a, v) => { v = 0; });
 
 		Font font = new Font("Courier New", 8);
-		public Brush regBrush = Brushes.Black;
 		public Brush highlightBrush = Brushes.LightBlue;
 		int RowsVisible = 0;
 		int DataSize = 1;
@@ -66,8 +66,6 @@ namespace BizHawk.MultiClient
 			this.info.Location = new System.Drawing.Point(n.X / 2, 1);
 			this.info.Height = 11;
 			this.Controls.Add(this.info);
-
-			this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.MemoryViewer_KeyDown);
 		}
 
 		protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
@@ -127,7 +125,7 @@ namespace BizHawk.MultiClient
 				nibbles[x] = 'G';
 		}
 
-		private void MemoryViewer_KeyDown(object sender, System.Windows.Forms.KeyEventArgs e)
+		protected override void OnKeyUp(KeyEventArgs e)
 		{
 			if (!InputValidate.IsValidHexNumber(((char)e.KeyCode).ToString()))
 			{
@@ -151,6 +149,7 @@ namespace BizHawk.MultiClient
 				this.Refresh();
 			}
 
+			base.OnKeyUp(e);
 		}
 
 		public void SetHighlighted(int addr)
@@ -178,7 +177,7 @@ namespace BizHawk.MultiClient
 		{
 			unchecked
 			{
-				Pen p = new Pen(regBrush);
+				Pen p = new Pen(Brushes.Black);
 				row = 0;
 				addr = 0;