diff --git a/common/include/Utilities/EventSource.h b/common/include/Utilities/EventSource.h index 525f06abc2..50ce649027 100644 --- a/common/include/Utilities/EventSource.h +++ b/common/include/Utilities/EventSource.h @@ -83,7 +83,7 @@ template< typename ListenerType > class EventListenerBinding { public: - typedef typename EventSource EventSourceType; + typedef typename EventSource::EventSourceType EventSourceType; typedef typename EventSource::ListenerIterator ListenerIterator; protected: diff --git a/pcsx2/gui/ConsoleLogger.h b/pcsx2/gui/ConsoleLogger.h index 3637370730..762eb708e7 100644 --- a/pcsx2/gui/ConsoleLogger.h +++ b/pcsx2/gui/ConsoleLogger.h @@ -101,6 +101,7 @@ protected: public: pxLogTextCtrl(wxWindow* parent); + ~pxLogTextCtrl() throw(); bool HasWriteLock() const { return m_FreezeWrites; } void ConcludeIssue( int lines ); diff --git a/pcsx2/gui/Dialogs/StuckThreadDialog.cpp b/pcsx2/gui/Dialogs/StuckThreadDialog.cpp index ab25711837..baade203fa 100644 --- a/pcsx2/gui/Dialogs/StuckThreadDialog.cpp +++ b/pcsx2/gui/Dialogs/StuckThreadDialog.cpp @@ -32,7 +32,7 @@ Dialogs::StuckThreadDialog::StuckThreadDialog( wxWindow* parent, StuckThreadActi L"The thread '%s' is not responding. It could be deadlocked, or it might " L"just be running *really* slowly." ), - stuck_thread.GetName() + stuck_thread.GetName().data() ) ); diff --git a/pcsx2/gui/pxLogTextCtrl.cpp b/pcsx2/gui/pxLogTextCtrl.cpp index 4e1d09985a..29c91a1cdd 100644 --- a/pcsx2/gui/pxLogTextCtrl.cpp +++ b/pcsx2/gui/pxLogTextCtrl.cpp @@ -100,6 +100,10 @@ void pxLogTextCtrl::OnThumbRelease(wxScrollWinEvent& evt) evt.Skip(); } +pxLogTextCtrl::~pxLogTextCtrl() throw() +{ +} + void pxLogTextCtrl::ConcludeIssue( int lines ) { if( HasWriteLock() ) return;