Small changes that were lost in revision 936.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1091 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp

@@ -55,8 +55,8 @@ namespace Jit64
 	void lbzx(UGeckoInstruction inst)
 	{
 #ifdef JIT_OFF_OPTIONS
-		//if(Core::g_CoreStartupParameter.bJITOff || Core::g_CoreStartupParameter.bJITLoadStoreOff)
+		if(Core::g_CoreStartupParameter.bJITOff || Core::g_CoreStartupParameter.bJITLoadStoreOff)
-		//	{Default(inst); return;} // turn off from debugger	
+			{Default(inst); return;} // turn off from debugger	
 #endif
 		INSTRUCTION_START;
 
@@ -80,8 +80,8 @@ namespace Jit64
 	void lXz(UGeckoInstruction inst)
 	{
 #ifdef JIT_OFF_OPTIONS
-		//if(Core::g_CoreStartupParameter.bJITOff || Core::g_CoreStartupParameter.bJITLoadStoreOff)
+		if(Core::g_CoreStartupParameter.bJITOff || Core::g_CoreStartupParameter.bJITLoadStoreOff)
-		//	{Default(inst); return;} // turn off from debugger	
+			{Default(inst); return;} // turn off from debugger	
 #endif
 		INSTRUCTION_START;
 
@@ -170,8 +170,8 @@ namespace Jit64
 	void lha(UGeckoInstruction inst)
 	{
 #ifdef JIT_OFF_OPTIONS
-		//if(Core::g_CoreStartupParameter.bJITOff || Core::g_CoreStartupParameter.bJITLoadStoreOff)
+		if(Core::g_CoreStartupParameter.bJITOff || Core::g_CoreStartupParameter.bJITLoadStoreOff)
-		//	{Default(inst); return;} // turn off from debugger	
+			{Default(inst); return;} // turn off from debugger	
 #endif
 		INSTRUCTION_START;
 
@@ -194,8 +194,8 @@ namespace Jit64
 	void dcbz(UGeckoInstruction inst)
 	{
 #ifdef JIT_OFF_OPTIONS
-		//if(Core::g_CoreStartupParameter.bJITOff || Core::g_CoreStartupParameter.bJITLoadStoreOff)
+		if(Core::g_CoreStartupParameter.bJITOff || Core::g_CoreStartupParameter.bJITLoadStoreOff)
-		//	{Default(inst); return;} // turn off from debugger	
+			{Default(inst); return;} // turn off from debugger	
 #endif
 		INSTRUCTION_START;
 
@@ -217,8 +217,8 @@ namespace Jit64
 	void stX(UGeckoInstruction inst)
 	{
 #ifdef JIT_OFF_OPTIONS
-		//if(Core::g_CoreStartupParameter.bJITOff || Core::g_CoreStartupParameter.bJITLoadStoreOff)
+		if(Core::g_CoreStartupParameter.bJITOff || Core::g_CoreStartupParameter.bJITLoadStoreOff)
-		//	{Default(inst); return;} // turn off from debugger	
+			{Default(inst); return;} // turn off from debugger	
 #endif
 		INSTRUCTION_START;
 

Source/Plugins/Plugin_DSP_HLE/Src/Debugger/Debugger.cpp

@@ -39,21 +39,19 @@ extern bool gOnlyLooping;
 // =======================================================================================
 // Declare events
 BEGIN_EVENT_TABLE(CDebugger,wxDialog)	
-	EVT_CLOSE(CDebugger::OnClose)
+	EVT_CLOSE(CDebugger::OnClose) // on close event
-	EVT_BUTTON(ID_UPD,CDebugger::OnUpdate)
+
-	EVT_CHECKBOX(IDC_CHECK0,CDebugger::SaveFile)
+	EVT_BUTTON(ID_UPD,CDebugger::OnUpdate) // buttons
+
+	EVT_CHECKBOX(IDC_CHECK0,CDebugger::SaveFile) // options
 	EVT_CHECKBOX(IDC_CHECK2,CDebugger::ShowHideConsole)
+	EVT_CHECKBOX(IDC_CHECK3,CDebugger::OnlyLooping)		
 
-	EVT_CHECKBOX(IDC_CHECK3,CDebugger::SSBM)
+	EVT_RADIOBOX(IDC_RADIO1,CDebugger::ChangeFrequency) // update frequency
-	EVT_CHECKBOX(IDC_CHECK4,CDebugger::SSBMremedy1)
-	EVT_CHECKBOX(IDC_CHECK5,CDebugger::SSBMremedy2)
-	EVT_CHECKBOX(IDC_CHECK8,CDebugger::Sequenced)
-	EVT_CHECKBOX(IDC_CHECK9,CDebugger::Volume)
-	EVT_CHECKBOX(IDC_CHECK6,CDebugger::Reset)
-	EVT_CHECKBOX(IDC_CHECK7,CDebugger::OnlyLooping)
 
-	EVT_RADIOBOX(IDC_RADIO1,CDebugger::ChangeFrequency)
+	EVT_RADIOBOX(IDC_RADIO2,CDebugger::ChangePreset) // presets
-	EVT_RADIOBOX(IDC_RADIO2,CDebugger::ChangePreset)
+
+	EVT_CHECKLISTBOX(IDC_CHECKLIST1, CDebugger::OnSettingsCheck) // settings
 END_EVENT_TABLE()
 // =======================================================================================
 
@@ -140,19 +138,17 @@ SetTitle(wxT("Sound Debugging"));
 	wxStaticBoxSizer* sLeft;
 
 	// checkboxes and labels -----------------------------------------------------
-	m_Label[0] = new wxStaticBox(this, IDG_LABEL1, wxT("Options"),
+	wxStaticBoxSizer * m_checkSizer = new wxStaticBoxSizer (wxVERTICAL, this, wxT("Options"));
-		wxDefaultPosition, wxDefaultSize, 0);
-	wxStaticBoxSizer * m_checkSizer = new wxStaticBoxSizer (m_Label[0], wxVERTICAL);
 
 	// checkboxes
-	m_Check[0] = new wxCheckBox(this, IDC_CHECK0, wxT("Save to file"),
+	m_Check[0] = new wxCheckBox(this, IDC_CHECK1, wxT("Save to file"),
 		wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	m_Check[1] = new wxCheckBox(this, IDC_CHECK1, wxT("Show updated"),
+	m_Check[1] = new wxCheckBox(this, IDC_CHECK2, wxT("Show updated"),
 		wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
 	m_Check[1]->Enable(false);
-	m_Check[7] = new wxCheckBox(this, IDC_CHECK7, wxT("Only looping"),
+	m_Check[7] = new wxCheckBox(this, IDC_CHECK3, wxT("Only looping"),
 		wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	m_Check[2] = new wxCheckBox(this, IDC_CHECK2, wxT("Show console"),
+	m_Check[2] = new wxCheckBox(this, IDC_CHECK4, wxT("Show console"),
 		wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
 	
     m_checkSizer->Add(m_Check[0], 0, 0, 5);
@@ -162,38 +158,34 @@ SetTitle(wxT("Sound Debugging"));
 	// ------------------------
 
 	// settings checkboxes -----------------------------------------------------
-	m_Label[1] = new wxStaticBox(this, IDG_LABEL2, wxT("Settings"),
+	wxStaticBoxSizer * m_checkSizer2 = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Settings"));
-		wxDefaultPosition, wxDefaultSize, 0);
+	m_settings = new wxCheckListBox(this, IDC_CHECKLIST1, wxDefaultPosition, wxDefaultSize,
-	wxStaticBoxSizer * m_checkSizer2 = new wxStaticBoxSizer (m_Label[1], wxVERTICAL);
+		0, NULL, wxNO_BORDER);
-
-	// checkboxes
-	m_Check[3] = new wxCheckBox(this, IDC_CHECK3, wxT("SSBM fix"),
-		wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-		m_Check[3]->SetValue(gSSBM);
-	m_Check[4] = new wxCheckBox(this, IDC_CHECK4, wxT("SSBM remedy 1"),
-		wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-		m_Check[4]->SetValue(gSSBMremedy1);
-	m_Check[5] = new wxCheckBox(this, IDC_CHECK5, wxT("SSBM remedy 2"),
-		wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-		m_Check[5]->SetValue(gSSBMremedy2);
-	m_Check[8] = new wxCheckBox(this, IDC_CHECK8, wxT("Sequenced"),
-		wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-		m_Check[8]->SetValue(gSequenced);
-	m_Check[9] = new wxCheckBox(this, IDC_CHECK9, wxT("Volume delta"),
-		wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-		m_Check[9]->SetValue(gVolume);
-	m_Check[6] = new wxCheckBox(this, IDC_CHECK6, wxT("Reset all"),
-		wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-		m_Check[6]->SetValue(gReset);
 	
-	m_checkSizer2->Add(m_Check[3], 0, 0, 5);
+	m_settings->Append(wxT("SSBM fix"));
-	m_checkSizer2->Add(m_Check[4], 0, 0, 5);
+	m_settings->Append(wxT("SSBM remedy 1"));
-	m_checkSizer2->Add(m_Check[5], 0, 0, 5);
+	m_settings->Append(wxT("SSBM remedy 2"));
-	m_checkSizer2->Add(m_Check[8], 0, 0, 5);
+	m_settings->Append(wxT("Sequenced"));
-	m_checkSizer2->Add(m_Check[9], 0, 0, 5);
+	m_settings->Append(wxT("Volume delta"));
-	m_checkSizer2->Add(m_Check[6], 0, 0, 5);
+	m_settings->Append(wxT("Reset all"));
-	// ------------------------
+	
+	m_settings->Check(0, gSSBM);
+	m_settings->Check(1, gSSBMremedy1);
+	m_settings->Check(2, gSSBMremedy2);
+	m_settings->Check(3, gSequenced);
+	m_settings->Check(4, gVolume);
+	m_settings->Check(5, gReset);
 
+	// because the wxCheckListBox is a little underdeveloped we have to help it with this
+	// to bad there's no windows xp styles for the checkboxes
+	m_settings->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
+	m_settings->SetMinSize(wxSize(m_settings->GetSize().GetWidth() - 40,
+		m_settings->GetCount() * 15));
+	for (int i = 0; i < m_settings->GetCount(); ++i)
+		m_settings->GetItem(i)->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
+
+	m_checkSizer2->Add(m_settings, 0, 0, 0);
+	// ------------------------
 
 	// radio boxes -----------------------------------------------------
 	int m_radioBoxNChoices[2];
@@ -232,32 +224,27 @@ SetTitle(wxT("Sound Debugging"));
 	sButtons2->AddStretchSpacer(1);
 	sButtons2->Add(m_RadioBox[2], 0, 0, 5);
 	sButtons2->AddStretchSpacer(1);
-	sButtons2->Add(m_checkSizer2, 0, 2, 5);
+	sButtons2->Add(m_checkSizer2, 0, 0, 5);
 	sButtons2->AddStretchSpacer(1);
 
 	// left buttons
 	wxBoxSizer* sButtons;
 	sButtons = new wxBoxSizer(wxVERTICAL);
 
-	sButtons->AddStretchSpacer(1);
+	sButtons->AddSpacer(5); // to set a minimum margin
 
 	sButtons->Add(m_Upd, 0, 0, 5);
 	sButtons->Add(m_SelC, 0, 0, 5);
 	sButtons->Add(m_Presets, 0, 0, 5);
 
 	sButtons->AddStretchSpacer(1);
-
+	sButtons->Add(m_checkSizer, 0, 0, 5);
-	sButtons->Add(m_checkSizer, 0, 2, 5);
-
 	sButtons->AddStretchSpacer(1);
-
 	sButtons->Add(m_RadioBox[0], 0, 0, 5);
-
 	sButtons->AddStretchSpacer(1);
-
 	sButtons->Add(m_RadioBox[1], 0, 0, 5);
 
-	sButtons->AddStretchSpacer(1);
+	sButtons->AddSpacer(5);
 
 	// blocks view
 	sLeft = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Current Status"));
@@ -266,9 +253,9 @@ SetTitle(wxT("Sound Debugging"));
 
 	// add all stuff to the main container
 	sMain = new wxBoxSizer(wxHORIZONTAL);
-	sMain->Add(sLeft, 1, wxEXPAND|wxALL, 5);
+	sMain->Add(sLeft, 1, wxEXPAND | wxALL, 5); // margin = 5
-	sMain->Add(sButtons, 0, wxEXPAND, 0);
+	sMain->Add(sButtons, 0, wxALL, 0);
-	sMain->Add(sButtons2, 0, wxEXPAND, 0);
+	sMain->Add(sButtons2, 0, wxALL, 5); // margin = 5
 
 	this->SetSizer(sMain);
 	sMain->SetSizeHints(this);
@@ -300,48 +287,14 @@ void CDebugger::OnUpdate(wxCommandEvent& /*event*/)
 // =======================================================================================
 // Settings
 // --------------
-void CDebugger::SSBM(wxCommandEvent& event)
+void CDebugger::OnSettingsCheck(wxCommandEvent& event)
 {
-	if(m_Check[3]->IsChecked() == 1)
+	gSSBM = m_settings->IsChecked(0);
-		{gSSBM = true;}
+	gSSBMremedy1 = m_settings->IsChecked(1);
-	else
+	gSSBMremedy2 = m_settings->IsChecked(2);
-		{gSSBM = false;}
+	gSequenced = m_settings->IsChecked(3);
-}
+	gVolume = m_settings->IsChecked(4);
-
+	gReset = m_settings->IsChecked(5);
-void CDebugger::SSBMremedy1(wxCommandEvent& event)
-{
-	if(m_Check[4]->IsChecked() == 1)
-		{gSSBMremedy1 = true;}
-	else
-		{gSSBMremedy1 = false;}
-}
-void CDebugger::SSBMremedy2(wxCommandEvent& event)
-{
-	if(m_Check[5]->IsChecked() == 1)
-		{gSSBMremedy2 = true;}
-	else
-		{gSSBMremedy2 = false;}
-}
-void CDebugger::Sequenced(wxCommandEvent& event)
-{
-	if(m_Check[8]->IsChecked() == 1)
-		{gSequenced = true;}
-	else
-		{gSequenced = false;}
-}
-void CDebugger::Volume(wxCommandEvent& event)
-{
-	if(m_Check[9]->IsChecked() == 1)
-		{gVolume = true;}
-	else
-		{gVolume = false;}
-}
-void CDebugger::Reset(wxCommandEvent& event)
-{
-	if(m_Check[6]->IsChecked() == 1)
-		{gReset = true;}
-	else
-		{gReset = false;}
 }
 // =======================================================================================
 

Source/Plugins/Plugin_DSP_HLE/Src/Debugger/Debugger.h

@@ -69,25 +69,20 @@ class CDebugger : public wxDialog
 		void NotifyUpdate();
 		void OnUpdate(wxCommandEvent& event);
 
-		void SaveFile(wxCommandEvent& event);
+		void SaveFile(wxCommandEvent& event); // options
 		void ShowHideConsole(wxCommandEvent& event);
 		void DoShowHideConsole();
-		void ChangeFrequency(wxCommandEvent& event);
+		void OnlyLooping(wxCommandEvent& event);
+
+
+		void ChangeFrequency(wxCommandEvent& event); // update frequency
 		void DoChangeFrequency();
 		void ChangePreset(wxCommandEvent& event);
 		void DoChangePreset();
 
-		void SSBM(wxCommandEvent& event);
+		void OnSettingsCheck(wxCommandEvent& event); // settings				
-		void SSBMremedy1(wxCommandEvent& event);
-		void SSBMremedy2(wxCommandEvent& event);
-		void BSDON(wxCommandEvent& event);		
-		void Sequenced(wxCommandEvent& event);
-		void Volume(wxCommandEvent& event);
-		void Reset(wxCommandEvent& event);	
-		void OnlyLooping(wxCommandEvent& event);		
 
-		CPBView* m_GPRListView;
+		CPBView* m_GPRListView;		
-		
 
 	private:
 
@@ -95,7 +90,7 @@ class CDebugger : public wxDialog
 		wxCheckBox *m_Check[9];
 		wxRadioButton *m_Radio[5];
 		wxRadioBox *m_RadioBox[3];
-		wxStaticBox *m_Label[1];
+		wxCheckListBox * m_settings;
 		wxPanel *m_Controller;
 
 		// WARNING: Make sure these are not also elsewhere, for example in resource.h.
@@ -106,11 +101,7 @@ class CDebugger : public wxDialog
 			IDC_CHECK2,
 			IDC_CHECK3,
 			IDC_CHECK4,
-			IDC_CHECK5,
+			IDC_CHECKLIST1,
-			IDC_CHECK6,
-			IDC_CHECK7,
-			IDC_CHECK8,
-			IDC_CHECK9,
 			IDC_RADIO0,
 			IDC_RADIO1,
 			IDC_RADIO2,

Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp

@@ -676,7 +676,8 @@ bool CUCode_AX::AXTask(u32& _uMail)
 				    num += 2;
 			    }
 
-			    PanicAlert(szTemp);
+				// Wii AX will always show this
+			    //PanicAlert(szTemp);
 			    bFirst = false;
 		    }