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

Fix the RecentIsoList. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2484 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2010-01-23 02:02:05 +00:00
parent b594d6e37b
commit 12200c2c10
4 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pcsx2/gui/AppEventListeners.h
View File

@ -163,13 +163,14 @@ protected:
}; };
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// EventListenerHelper_AppStatus // EventListenerHelpers (CoreThread / Plugins / AppStatus)
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// Welcome to the awkward world of C++ multi-inheritence. wxWidgets' Connect() system is // Welcome to the awkward world of C++ multi-inheritence. wxWidgets' Connect() system is
// incompatible because of limitations in C++ class member function pointers, so we need // incompatible because of limitations in C++ class member function pointers, so we need
// this second layer class to act as a bridge between the event system and the class's // this second layer class to act as a bridge between the event system and the class's
// handler implementations. // handler implementations.
// //
template< typename TypeToDispatchTo > template< typename TypeToDispatchTo >
class EventListenerHelper_CoreThread : public IEventListener_CoreThread class EventListenerHelper_CoreThread : public IEventListener_CoreThread
{ {
@ -197,14 +198,6 @@ protected:
void OnCoreStatus_Stopped() { Owner.OnCoreStatus_Stopped(); } void OnCoreStatus_Stopped() { Owner.OnCoreStatus_Stopped(); }
}; };
// --------------------------------------------------------------------------------------
// EventListenerHelper_AppStatus
// --------------------------------------------------------------------------------------
// Welcome to the awkward world of C++ multi-inheritence. wxWidgets' Connect() system is
// incompatible because of limitations in C++ class member function pointers, so we need
// this second layer class to act as a bridge between the event system and the class's
// handler implementations.
//
template< typename TypeToDispatchTo > template< typename TypeToDispatchTo >
class EventListenerHelper_Plugins : public IEventListener_Plugins class EventListenerHelper_Plugins : public IEventListener_Plugins
{ {
@ -234,14 +227,6 @@ protected:
void OnPluginsEvt_Unloaded() { Owner.OnPluginsEvt_Unloaded(); } void OnPluginsEvt_Unloaded() { Owner.OnPluginsEvt_Unloaded(); }
}; };
// --------------------------------------------------------------------------------------
// EventListenerHelper_AppStatus
// --------------------------------------------------------------------------------------
// Welcome to the awkward world of C++ multi-inheritence. wxWidgets' Connect() system is
// incompatible because of limitations in C++ class member function pointers, so we need
// this second layer class to act as a bridge between the event system and the class's
// handler implementations.
//
template< typename TypeToDispatchTo > template< typename TypeToDispatchTo >
class EventListenerHelper_AppStatus : public IEventListener_AppStatus class EventListenerHelper_AppStatus : public IEventListener_AppStatus
{ {

9
pcsx2/gui/ConsoleLogger.h
View File

@ -89,9 +89,14 @@ public:
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// pxLogTextCtrl // pxLogTextCtrl
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
class pxLogTextCtrl : public wxTextCtrl, public IEventListener_CoreThread, public IEventListener_Plugins class pxLogTextCtrl : public wxTextCtrl,
public IEventListener_CoreThread,
public IEventListener_Plugins
{ {
protected: protected:
//EventListenerHelper_CoreThread<pxLogTextCtrl> m_listener_CoreThread;
//EventListenerHelper_Plugins<pxLogTextCtrl> m_listener_Plugins;
#ifdef __WXMSW__ #ifdef __WXMSW__
int m_win32_LinesPerPage; int m_win32_LinesPerPage;
int m_win32_LinesPerScroll; int m_win32_LinesPerScroll;
@ -101,7 +106,7 @@ protected:
public: public:
pxLogTextCtrl(wxWindow* parent); pxLogTextCtrl(wxWindow* parent);
~pxLogTextCtrl() throw(); virtual ~pxLogTextCtrl() throw();
bool HasWriteLock() const { return m_FreezeWrites; } bool HasWriteLock() const { return m_FreezeWrites; }
void ConcludeIssue( int lines ); void ConcludeIssue( int lines );

4
pcsx2/gui/RecentIsoList.cpp
View File

@ -137,12 +137,12 @@ void RecentIsoManager::InsertIntoMenu( int id )
curitem.ItemPtr->Check(); curitem.ItemPtr->Check();
} }
void RecentIsoManager::AppEvent_OnSettingsApplied() void RecentIsoManager::AppStatusEvent_OnSettingsApplied()
{ {
// TODO : Implement application of Recent Iso List "maximum" history option // TODO : Implement application of Recent Iso List "maximum" history option
} }
void RecentIsoManager::AppEvent_OnSettingsLoadSave( const AppSettingsEventInfo& evt ) void RecentIsoManager::AppStatusEvent_OnSettingsLoadSave( const AppSettingsEventInfo& evt )
{ {
IniInterface& ini( evt.GetIni() ); IniInterface& ini( evt.GetIni() );

4
pcsx2/gui/RecentIsoList.h
View File

@ -56,7 +56,7 @@ protected:
void InsertIntoMenu( int id ); void InsertIntoMenu( int id );
void OnChangedSelection( wxCommandEvent& evt ); void OnChangedSelection( wxCommandEvent& evt );
void AppEvent_OnSettingsLoadSave( const AppSettingsEventInfo& ini ); void AppStatusEvent_OnSettingsLoadSave( const AppSettingsEventInfo& ini );
void AppEvent_OnSettingsApplied(); void AppStatusEvent_OnSettingsApplied();
}; };