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

Hurrah for gcc. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2477 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-01-22 16:55:39 +00:00
parent cf809cd1df
commit 6d9fb042cd
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/include/Utilities/EventSource.h
View File

@ -83,7 +83,7 @@ template< typename ListenerType >
class EventListenerBinding class EventListenerBinding
{ {
public: public:
typedef typename EventSource<ListenerType> EventSourceType; typedef typename EventSource<ListenerType>::EventSourceType EventSourceType;
typedef typename EventSource<ListenerType>::ListenerIterator ListenerIterator; typedef typename EventSource<ListenerType>::ListenerIterator ListenerIterator;
protected: protected:

1
pcsx2/gui/ConsoleLogger.h
View File

@ -101,6 +101,7 @@ protected:
public: public:
pxLogTextCtrl(wxWindow* parent); pxLogTextCtrl(wxWindow* parent);
~pxLogTextCtrl() throw();
bool HasWriteLock() const { return m_FreezeWrites; } bool HasWriteLock() const { return m_FreezeWrites; }
void ConcludeIssue( int lines ); void ConcludeIssue( int lines );

2
pcsx2/gui/Dialogs/StuckThreadDialog.cpp
View File

@ -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"The thread '%s' is not responding. It could be deadlocked, or it might "
L"just be running *really* slowly." L"just be running *really* slowly."
), ),
stuck_thread.GetName() stuck_thread.GetName().data()
) ); ) );

4
pcsx2/gui/pxLogTextCtrl.cpp
View File

@ -100,6 +100,10 @@ void pxLogTextCtrl::OnThumbRelease(wxScrollWinEvent& evt)
evt.Skip(); evt.Skip();
} }
pxLogTextCtrl::~pxLogTextCtrl() throw()
{
}
void pxLogTextCtrl::ConcludeIssue( int lines ) void pxLogTextCtrl::ConcludeIssue( int lines )
{ {
if( HasWriteLock() ) return; if( HasWriteLock() ) return;