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

Fix some 'o dat Linux thang! 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2080 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-10-25 23:21:46 +00:00
parent 581e8a30a7
commit eea8ff9767
5 changed files with 138 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/build/Utilities/Utilities.cbp
View File

@ -85,6 +85,7 @@
<Unit filename="../../include/Utilities/Console.h" />
<Unit filename="../../include/Utilities/Dependencies.h" />
<Unit filename="../../include/Utilities/EventSource.h" />
<Unit filename="../../include/Utilities/EventSource.inl" />
<Unit filename="../../include/Utilities/Exceptions.h" />
<Unit filename="../../include/Utilities/General.h" />
<Unit filename="../../include/Utilities/HashMap.h" />
@ -101,6 +102,7 @@
<Unit filename="../../include/intrin_x86.h" />
<Unit filename="../../src/Utilities/AlignedMalloc.cpp" />
<Unit filename="../../src/Utilities/Console.cpp" />
<Unit filename="../../src/Utilities/EventSource.cpp" />
<Unit filename="../../src/Utilities/Exceptions.cpp" />
<Unit filename="../../src/Utilities/HashTools.cpp" />
<Unit filename="../../src/Utilities/Linux/LnxHostSys.cpp" />

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

@ -25,7 +25,7 @@ class wxCommandEvent;
#if defined( __GNUC__ ) && (__GNUC__ < 4 ) || ((__GNUC__ == 4) && ( __GNUC_MINOR__ <= 3 ))
# define __evt_fastcall
#else
# define __evt_fastcall _fastcall
# define __evt_fastcall __fastcall
#endif
// --------------------------------------------------------------------------------------
@ -188,6 +188,5 @@ typedef EventListenerBinding<wxCommandEvent> CmdEvt_ListenerBinding;
#define EventSource_ImplementType( tname ) \
template void EventSource<tname>::Add(const EventSource<tname>::ListenerType &listener); \
template void EventSource<tname>::RemoveObject(const void* object); \
template void EventSource<tname>::Add(const EventSource<tname>::ListenerType &listener); \
template void EventSource<tname>::Dispatch(tname& evt); \
template void EventSource<tname>::_DispatchRaw( EventSource<tname>::ConstIterator iter, const EventSource<tname>::ConstIterator& iend, tname& evt );

4
pcsx2/gui/Panels/BiosSelectorPanel.cpp
View File

@ -33,7 +33,7 @@ Panels::BaseSelectorPanel::BaseSelectorPanel( wxWindow& parent, int idealWidth )
Connect( wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEventHandler(PluginSelectorPanel::OnFolderChanged), NULL, this );
}
Panels::BaseSelectorPanel::~BaseSelectorPanel()
Panels::BaseSelectorPanel::~BaseSelectorPanel() throw()
{
}
@ -92,7 +92,7 @@ Panels::BiosSelectorPanel::BiosSelectorPanel( wxWindow& parent, int idealWidth )
SetSizer( &sizer );
}
Panels::BiosSelectorPanel::~BiosSelectorPanel()
Panels::BiosSelectorPanel::~BiosSelectorPanel() throw ()
{
}

4
pcsx2/gui/Panels/ConfigurationPanels.h
View File

@ -367,7 +367,7 @@ namespace Panels
public:
BiosSelectorPanel( wxWindow& parent, int idealWidth );
virtual ~BiosSelectorPanel();
virtual ~BiosSelectorPanel() throw();
protected:
virtual void Apply();
@ -469,7 +469,7 @@ namespace Panels
ScopedPtr<EnumThread> m_EnumeratorThread;
public:
virtual ~PluginSelectorPanel();
virtual ~PluginSelectorPanel() throw();
PluginSelectorPanel( wxWindow& parent, int idealWidth );
void CancelRefresh(); // used from destructor, stays non-virtual

2
pcsx2/gui/Panels/PluginSelectorPanel.cpp
View File

@ -253,7 +253,7 @@ Panels::PluginSelectorPanel::PluginSelectorPanel( wxWindow& parent, int idealWid
Connect( ButtonId_Configure, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PluginSelectorPanel::OnConfigure_Clicked ) );
}
Panels::PluginSelectorPanel::~PluginSelectorPanel()
Panels::PluginSelectorPanel::~PluginSelectorPanel() throw()
{
CancelRefresh(); // in case the enumeration thread is currently refreshing...
}