diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index 80f901f6ad..5d26592b92 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -426,6 +426,9 @@
QuickProgressPopup.cs
+
+ Component
+
Component
diff --git a/BizHawk.Client.EmuHawk/CustomControls/ReadonlyCheckbox.cs b/BizHawk.Client.EmuHawk/CustomControls/ReadonlyCheckbox.cs
new file mode 100644
index 0000000000..d7895ca95e
--- /dev/null
+++ b/BizHawk.Client.EmuHawk/CustomControls/ReadonlyCheckbox.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Windows.Forms;
+
+namespace BizHawk.Client.EmuHawk
+{
+ public class ReadonlyCheckBox : CheckBox
+ {
+ protected override void OnClick(EventArgs e)
+ {
+ // Do nothing
+ }
+ }
+}
diff --git a/BizHawk.Client.EmuHawk/tools/Atari2600/Atari2600Debugger.Designer.cs b/BizHawk.Client.EmuHawk/tools/Atari2600/Atari2600Debugger.Designer.cs
index d1f847ee21..5e3e499ae1 100644
--- a/BizHawk.Client.EmuHawk/tools/Atari2600/Atari2600Debugger.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/Atari2600/Atari2600Debugger.Designer.cs
@@ -43,15 +43,15 @@
this.ScanlineAdvanceBtn = new System.Windows.Forms.Button();
this.FrameAdvButton = new System.Windows.Forms.Button();
this.RegistersBox = new System.Windows.Forms.GroupBox();
- this.CFlagCheckbox = new System.Windows.Forms.CheckBox();
- this.ZFlagCheckbox = new System.Windows.Forms.CheckBox();
- this.IFlagCheckbox = new System.Windows.Forms.CheckBox();
- this.DFlagCheckbox = new System.Windows.Forms.CheckBox();
- this.BFlagCheckbox = new System.Windows.Forms.CheckBox();
- this.TFlagCheckbox = new System.Windows.Forms.CheckBox();
- this.VFlagCheckbox = new System.Windows.Forms.CheckBox();
+ this.CFlagCheckbox = new ReadonlyCheckBox();
+ this.ZFlagCheckbox = new ReadonlyCheckBox();
+ this.IFlagCheckbox = new ReadonlyCheckBox();
+ this.DFlagCheckbox = new ReadonlyCheckBox();
+ this.BFlagCheckbox = new ReadonlyCheckBox();
+ this.TFlagCheckbox = new ReadonlyCheckBox();
+ this.VFlagCheckbox = new ReadonlyCheckBox();
this.label6 = new System.Windows.Forms.Label();
- this.NFlagCheckbox = new System.Windows.Forms.CheckBox();
+ this.NFlagCheckbox = new ReadonlyCheckBox();
this.YRegisterHexBox = new System.Windows.Forms.TextBox();
this.XRegisterHexBox = new System.Windows.Forms.TextBox();
this.ARegisterHexBox = new System.Windows.Forms.TextBox();
@@ -87,8 +87,8 @@
this.StepOverButton = new System.Windows.Forms.Button();
this.StepOutButton = new System.Windows.Forms.Button();
this.BreakpointGroupBox = new System.Windows.Forms.GroupBox();
- this.AddBreakpointButton = new System.Windows.Forms.Button();
this.RemoveBreakpointButton = new System.Windows.Forms.Button();
+ this.AddBreakpointButton = new System.Windows.Forms.Button();
this.BreakpointView = new BizHawk.Client.EmuHawk.VirtualListView();
this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
@@ -677,17 +677,6 @@
this.BreakpointGroupBox.TabStop = false;
this.BreakpointGroupBox.Text = "Breakpoints";
//
- // AddBreakpointButton
- //
- this.AddBreakpointButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.AddBreakpointButton.Location = new System.Drawing.Point(8, 409);
- this.AddBreakpointButton.Name = "AddBreakpointButton";
- this.AddBreakpointButton.Size = new System.Drawing.Size(75, 23);
- this.AddBreakpointButton.TabIndex = 5;
- this.AddBreakpointButton.Text = "&Add";
- this.AddBreakpointButton.UseVisualStyleBackColor = true;
- this.AddBreakpointButton.Click += new System.EventHandler(this.AddBreakpointButton_Click);
- //
// RemoveBreakpointButton
//
this.RemoveBreakpointButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
@@ -699,6 +688,17 @@
this.RemoveBreakpointButton.UseVisualStyleBackColor = true;
this.RemoveBreakpointButton.Click += new System.EventHandler(this.RemoveBreakpointButton_Click);
//
+ // AddBreakpointButton
+ //
+ this.AddBreakpointButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.AddBreakpointButton.Location = new System.Drawing.Point(8, 409);
+ this.AddBreakpointButton.Name = "AddBreakpointButton";
+ this.AddBreakpointButton.Size = new System.Drawing.Size(75, 23);
+ this.AddBreakpointButton.TabIndex = 5;
+ this.AddBreakpointButton.Text = "&Add";
+ this.AddBreakpointButton.UseVisualStyleBackColor = true;
+ this.AddBreakpointButton.Click += new System.EventHandler(this.AddBreakpointButton_Click);
+ //
// BreakpointView
//
this.BreakpointView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@@ -826,15 +826,15 @@
private System.Windows.Forms.TextBox XRegisterHexBox;
private System.Windows.Forms.TextBox ARegisterHexBox;
private System.Windows.Forms.TextBox SPRegisterHexBox;
- private System.Windows.Forms.CheckBox CFlagCheckbox;
- private System.Windows.Forms.CheckBox ZFlagCheckbox;
- private System.Windows.Forms.CheckBox IFlagCheckbox;
- private System.Windows.Forms.CheckBox DFlagCheckbox;
- private System.Windows.Forms.CheckBox BFlagCheckbox;
- private System.Windows.Forms.CheckBox TFlagCheckbox;
- private System.Windows.Forms.CheckBox VFlagCheckbox;
+ private ReadonlyCheckBox CFlagCheckbox;
+ private ReadonlyCheckBox ZFlagCheckbox;
+ private ReadonlyCheckBox IFlagCheckbox;
+ private ReadonlyCheckBox DFlagCheckbox;
+ private ReadonlyCheckBox BFlagCheckbox;
+ private ReadonlyCheckBox TFlagCheckbox;
+ private ReadonlyCheckBox VFlagCheckbox;
private System.Windows.Forms.Label label6;
- private System.Windows.Forms.CheckBox NFlagCheckbox;
+ private ReadonlyCheckBox NFlagCheckbox;
private System.Windows.Forms.GroupBox CoreInfoBox;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.Label label8;
diff --git a/BizHawk.Client.EmuHawk/tools/Atari2600/Atari2600Debugger.cs b/BizHawk.Client.EmuHawk/tools/Atari2600/Atari2600Debugger.cs
index 2e448c2b7b..435c1ebbda 100644
--- a/BizHawk.Client.EmuHawk/tools/Atari2600/Atari2600Debugger.cs
+++ b/BizHawk.Client.EmuHawk/tools/Atari2600/Atari2600Debugger.cs
@@ -399,7 +399,6 @@ namespace BizHawk.Client.EmuHawk
#endregion
-
// TODO: these can be generic to any debugger
#region Breakpoint Classes