debugger improvments

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

2 files changed, 22 insertions, 22 deletions

diff --git a/Source/Core/DolphinWX/src/BootManager.cpp b/Source/Core/DolphinWX/src/BootManager.cpp
index 87d6b1741d..2cd0296b5f 100644
--- a/Source/Core/DolphinWX/src/BootManager.cpp
+++ b/Source/Core/DolphinWX/src/BootManager.cpp
@@ -34,7 +34,7 @@ static std::string s_DataBasePath_USA = "Data_USA";
 static std::string s_DataBasePath_JAP = "Data_JAP";

 

 extern CFrame* main_frame;

-extern CCodeWindow* code_frame;

+extern CCodeWindow* g_pCodeWindow;

 

 namespace BootManager

 {

@@ -46,10 +46,10 @@ bool BootCore(const std::string& _rFilename)
 {

 	SCoreStartupParameter StartUp = SConfig::GetInstance().m_LocalCoreStartupParameter;

 

-	if (code_frame)

+	if (g_pCodeWindow)

 	{

 //		StartUp.bUseDualCore = code_frame->UseDualCore();

-		StartUp.bUseDynarec = !code_frame->UseInterpreter();

+		StartUp.bUseDynarec = !g_pCodeWindow->UseInterpreter();

 	}

 	else

 	{

@@ -62,7 +62,7 @@ bool BootCore(const std::string& _rFilename)
 	StartUp.bHLEBios = true;

 	StartUp.bRunCompareClient = false;

 	StartUp.bRunCompareServer = false;

-	StartUp.bEnableDebugging = code_frame ? true : false; // RUNNING_DEBUG

+	StartUp.bEnableDebugging = g_pCodeWindow ? true : false; // RUNNING_DEBUG

 	std::string BaseDataPath;

     #ifdef _WIN32

 	StartUp.hInstance = wxGetInstance();

@@ -79,7 +79,7 @@ bool BootCore(const std::string& _rFilename)
 		return(false);

 	}

 

-	Core::SetState(code_frame ? Core::CORE_PAUSE : Core::CORE_RUN);

+	Core::SetState(g_pCodeWindow ? Core::CORE_PAUSE : Core::CORE_RUN);

 	return(true);

 }

 

diff --git a/Source/Core/DolphinWX/src/Main.cpp b/Source/Core/DolphinWX/src/Main.cpp
index 774e9144a0..c154b460e0 100644
--- a/Source/Core/DolphinWX/src/Main.cpp
+++ b/Source/Core/DolphinWX/src/Main.cpp
@@ -30,7 +30,7 @@
 IMPLEMENT_APP(DolphinApp)

 

 CFrame * main_frame = NULL;

-CCodeWindow* code_frame = NULL;

+CCodeWindow* g_pCodeWindow = NULL;

 

 // The `main program' equivalent, creating the windows and returning the

 // main frame

@@ -93,8 +93,8 @@ bool DolphinApp::OnInit()
 	// create debugger

 	if (UseDebugger)

 	{

-		code_frame = new CCodeWindow(SConfig::GetInstance().m_LocalCoreStartupParameter, main_frame);

-		code_frame->Show(true);

+		g_pCodeWindow = new CCodeWindow(SConfig::GetInstance().m_LocalCoreStartupParameter, main_frame);

+		g_pCodeWindow->Show(true);

 	}

 

 	SetTopWindow(main_frame);

@@ -121,9 +121,9 @@ void Host_BootingStarted()
 	wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_BOOTING_STARTED);

 	wxPostEvent(main_frame, event);

 

-	if (code_frame)

+	if (g_pCodeWindow)

 	{

-		wxPostEvent(code_frame, event);

+		wxPostEvent(g_pCodeWindow, event);

 	}

 }

 

@@ -133,9 +133,9 @@ void Host_BootingEnded()
 	wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_BOOTING_ENDED);

 	wxPostEvent(main_frame, event);

 

-	if (code_frame)

+	if (g_pCodeWindow)

 	{

-		wxPostEvent(code_frame, event);

+		wxPostEvent(g_pCodeWindow, event);

 	}

 }

 

@@ -147,9 +147,9 @@ void Host_NotifyMapLoaded()
 	wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_NOTIFYMAPLOADED);

 	wxPostEvent(main_frame, event);

 

-	if (code_frame)

+	if (g_pCodeWindow)

 	{

-		wxPostEvent(code_frame, event);

+		wxPostEvent(g_pCodeWindow, event);

 	}

 }

 

@@ -159,9 +159,9 @@ void Host_UpdateLogDisplay()
 	wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATELOGDISPLAY);

 	wxPostEvent(main_frame, event);

 

-	if (code_frame)

+	if (g_pCodeWindow)

 	{

-		wxPostEvent(code_frame, event);

+		wxPostEvent(g_pCodeWindow, event);

 	}

 }

 

@@ -170,9 +170,9 @@ void Host_UpdateDisasmDialog()
 {

 	wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATEDISASMDIALOG);

 	wxPostEvent(main_frame, event);

-	if (code_frame)

+	if (g_pCodeWindow)

 	{

-		wxPostEvent(code_frame, event);

+		wxPostEvent(g_pCodeWindow, event);

 	}

 }

 

@@ -182,9 +182,9 @@ void Host_UpdateMainFrame()
 	wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATEGUI);

 	wxPostEvent(main_frame, event);

 

-	if (code_frame)

+	if (g_pCodeWindow)

 	{

-		wxPostEvent(code_frame, event);

+		wxPostEvent(g_pCodeWindow, event);

 	}

 }

 

@@ -193,9 +193,9 @@ void Host_UpdateBreakPointView()
 	wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATEBREAKPOINTS);

 	wxPostEvent(main_frame, event);

 

-	if (code_frame)

+	if (g_pCodeWindow)

 	{

-		wxPostEvent(code_frame, event);

+		wxPostEvent(g_pCodeWindow, event);

 	}

 }