ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Jake.Stine 2010-04-27 17:04:12 +00:00
parent 7bdcc2c2a4
commit 7c31236f8e
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2/R5900OpcodeImpl.cpp
View File

@ -125,8 +125,8 @@ static char deci2buffer[256];
void Deci2Reset() void Deci2Reset()
{ {
deci2handler = NULL; deci2handler = 0;
deci2addr = NULL; deci2addr = 0;
memzero( deci2buffer ); memzero( deci2buffer );
} }

16
pcsx2/gui/MainFrame.cpp
View File

@ -269,10 +269,6 @@ static int GetPluginMenuId_Name( PluginsEnum_t pid )
MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title) MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title)
: wxFrame(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE & ~(wxMAXIMIZE_BOX | wxRESIZE_BORDER) ) : 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_statusbar( *CreateStatusBar(2, 0) )
, m_background( this, wxID_ANY, wxGetApp().GetLogoBitmap() ) , 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. // 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")); _("For running raw PS2 binaries directly"));
m_menuSys.AppendSeparator(); 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 // 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 // with the main frame window. When one is clicked, the other is assured to be brought

4
pcsx2/gui/MainFrame.h
View File

@ -106,6 +106,8 @@ class MainEmuFrame : public wxFrame,
public EventListener_CoreThread, public EventListener_CoreThread,
public EventListener_AppStatus public EventListener_AppStatus
{ {
typedef wxFrame _parent;
protected: protected:
bool m_RestartEmuOnDelete; bool m_RestartEmuOnDelete;
@ -146,6 +148,8 @@ public:
void EnableMenuItem( int id, bool enable ); void EnableMenuItem( int id, bool enable );
protected: protected:
void DoGiveHelp(const wxString& text, bool show);
void ApplySettings(); void ApplySettings();
void ApplyCoreStatus(); void ApplyCoreStatus();
void SaveEmuOptions(); void SaveEmuOptions();