From 7c31236f8e7290bcd639dfa64c810cb9dd0ee71a Mon Sep 17 00:00:00 2001
From: "Jake.Stine" <Jake.Stine@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Tue, 27 Apr 2010 17:04:12 +0000
Subject: [PATCH] Mirror the pulldown menu tooltips to the program/console log,
 so that you can see them (if you use the console log anyway -- if not, too
 bad. ;)

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2919 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 pcsx2/R5900OpcodeImpl.cpp |  4 ++--
 pcsx2/gui/MainFrame.cpp   | 16 +++++++++-------
 pcsx2/gui/MainFrame.h     |  4 ++++
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/pcsx2/R5900OpcodeImpl.cpp b/pcsx2/R5900OpcodeImpl.cpp
index 8929ab2a94..eb4dcbcc8d 100644
--- a/pcsx2/R5900OpcodeImpl.cpp
+++ b/pcsx2/R5900OpcodeImpl.cpp
@@ -125,8 +125,8 @@ static char deci2buffer[256];
 
 void Deci2Reset()
 {
-	deci2handler	= NULL;
-	deci2addr		= NULL;
+	deci2handler	= 0;
+	deci2addr		= 0;
 	memzero( deci2buffer );
 }
 
diff --git a/pcsx2/gui/MainFrame.cpp b/pcsx2/gui/MainFrame.cpp
index cdfda44c95..e486efdbd5 100644
--- a/pcsx2/gui/MainFrame.cpp
+++ b/pcsx2/gui/MainFrame.cpp
@@ -269,10 +269,6 @@ static int GetPluginMenuId_Name( PluginsEnum_t pid )
 MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title)
     : wxFrame(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE & ~(wxMAXIMIZE_BOX | wxRESIZE_BORDER) )
 
-// 	, m_listener_plugins	( this )
-// 	, m_listener_corethread	( this )
-// 	, m_listener_appstatus	( this )
-
 	, m_statusbar( *CreateStatusBar(2, 0) )
 	, m_background( this, wxID_ANY, wxGetApp().GetLogoBitmap() )
 
@@ -365,11 +361,11 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title)
 	// ------------------------------------------------------------------------
 	// Some of the items in the System menu are configured by the UpdateCoreStatus() method.
 	
-	m_menuSys.Append(MenuId_Boot_CDVD,			_("Initializing..."));
+	m_menuSys.Append(MenuId_Boot_CDVD,		_("Initializing..."));
 
-	m_menuSys.Append(MenuId_Boot_CDVD2,			_("Initializing..."));
+	m_menuSys.Append(MenuId_Boot_CDVD2,		_("Initializing..."));
 
-	m_menuSys.Append(MenuId_Boot_ELF,	_("Run ELF..."),
+	m_menuSys.Append(MenuId_Boot_ELF,		_("Run ELF..."),
 		_("For running raw PS2 binaries directly"));
 
 	m_menuSys.AppendSeparator();
@@ -491,6 +487,12 @@ MainEmuFrame::~MainEmuFrame() throw()
 	}
 }
 
+void MainEmuFrame::DoGiveHelp(const wxString& text, bool show)
+{
+	_parent::DoGiveHelp(text, show);
+	wxGetApp().GetProgramLog()->DoGiveHelp(text, show);
+}
+
 // ----------------------------------------------------------------------------
 // OnFocus / OnActivate : Special implementation to "connect" the console log window
 // with the main frame window.  When one is clicked, the other is assured to be brought
diff --git a/pcsx2/gui/MainFrame.h b/pcsx2/gui/MainFrame.h
index 67ca3769ee..18e9eaa56d 100644
--- a/pcsx2/gui/MainFrame.h
+++ b/pcsx2/gui/MainFrame.h
@@ -106,6 +106,8 @@ class MainEmuFrame : public wxFrame,
 	public EventListener_CoreThread,
 	public EventListener_AppStatus
 {
+	typedef wxFrame _parent;
+	
 protected:
 	bool			m_RestartEmuOnDelete;
 
@@ -146,6 +148,8 @@ public:
 	void EnableMenuItem( int id, bool enable );
 
 protected:
+	void DoGiveHelp(const wxString& text, bool show);
+
 	void ApplySettings();
 	void ApplyCoreStatus();
 	void SaveEmuOptions();