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

Fix errant code refactoring mistake regarding wxEVT_IDLE 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2414 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2010-01-08 15:51:31 +00:00
parent 9a9604aa2c
commit f34619dc5a
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
3rdparty/wxWidgets/include/wx/event.h vendored
View File

@ -260,7 +260,7 @@ BEGIN_DECLARE_EVENT_TYPES()
DECLARE_EVENT_TYPE(wxEVT_MEASURE_ITEM, 436) DECLARE_EVENT_TYPE(wxEVT_MEASURE_ITEM, 436)
DECLARE_EVENT_TYPE(wxEVT_COMPARE_ITEM, 437) DECLARE_EVENT_TYPE(wxEVT_COMPARE_ITEM, 437)
DECLARE_EVENT_TYPE(wxEVT_INIT_DIALOG, 438) DECLARE_EVENT_TYPE(wxEVT_INIT_DIALOG, 438)
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEvt_Idle, 439) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEVT_IDLE, 439)
DECLARE_EVENT_TYPE(wxEVT_UPDATE_UI, 440) DECLARE_EVENT_TYPE(wxEVT_UPDATE_UI, 440)
DECLARE_EVENT_TYPE(wxEVT_SIZING, 441) DECLARE_EVENT_TYPE(wxEVT_SIZING, 441)
DECLARE_EVENT_TYPE(wxEVT_MOVING, 442) DECLARE_EVENT_TYPE(wxEVT_MOVING, 442)
@ -2127,7 +2127,7 @@ private:
// Idle event // Idle event
/* /*
wxEvt_Idle wxEVT_IDLE
*/ */
// Whether to always send idle events to windows, or // Whether to always send idle events to windows, or
@ -2148,7 +2148,7 @@ class WXDLLIMPEXP_CORE wxIdleEvent : public wxEvent
{ {
public: public:
wxIdleEvent() wxIdleEvent()
: wxEvent(0, wxEvt_Idle), : wxEvent(0, wxEVT_IDLE),
m_requestMore(false) m_requestMore(false)
{ } { }
wxIdleEvent(const wxIdleEvent & event) wxIdleEvent(const wxIdleEvent & event)
@ -3069,7 +3069,7 @@ typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent&
EVT_JOY_ZMOVE(func) EVT_JOY_ZMOVE(func)
// Idle event // Idle event
#define EVT_IDLE(func) wx__DECLARE_EVT0(wxEvt_Idle, wxIdleEventHandler(func)) #define EVT_IDLE(func) wx__DECLARE_EVT0(wxEVT_IDLE, wxIdleEventHandler(func))
// Update UI event // Update UI event
#define EVT_UPDATE_UI(winid, func) wx__DECLARE_EVT1(wxEVT_UPDATE_UI, winid, wxUpdateUIEventHandler(func)) #define EVT_UPDATE_UI(winid, func) wx__DECLARE_EVT1(wxEVT_UPDATE_UI, winid, wxUpdateUIEventHandler(func))

8
3rdparty/wxWidgets/src/common/event.cpp vendored
View File

@ -157,7 +157,7 @@ const wxEventType wxEVT_FIRST = 10000;
const wxEventType wxEVT_USER_FIRST = wxEVT_FIRST + 2000; const wxEventType wxEVT_USER_FIRST = wxEVT_FIRST + 2000;
DEFINE_EVENT_TYPE(wxEVT_NULL) DEFINE_EVENT_TYPE(wxEVT_NULL)
DEFINE_EVENT_TYPE(wxEvt_Idle) DEFINE_EVENT_TYPE(wxEVT_IDLE)
DEFINE_EVENT_TYPE(wxEVT_SOCKET) DEFINE_EVENT_TYPE(wxEVT_SOCKET)
#endif // !WXWIN_COMPATIBILITY_EVENT_TYPES #endif // !WXWIN_COMPATIBILITY_EVENT_TYPES
@ -1248,10 +1248,10 @@ bool wxEvtHandler::TryParent(wxEvent& event)
{ {
if ( wxTheApp && (this != wxTheApp) ) if ( wxTheApp && (this != wxTheApp) )
{ {
// Special case: don't pass wxEvt_Idle to wxApp, since it'll always // Special case: don't pass wxEVT_IDLE to wxApp, since it'll always
// swallow it. wxEvt_Idle is sent explicitly to wxApp so it will be // swallow it. wxEVT_IDLE is sent explicitly to wxApp so it will be
// processed appropriately via SearchEventTable. // processed appropriately via SearchEventTable.
if ( event.GetEventType() != wxEvt_Idle ) if ( event.GetEventType() != wxEVT_IDLE )
{ {
if ( wxTheApp->ProcessEvent(event) ) if ( wxTheApp->ProcessEvent(event) )
return true; return true;

5
pcsx2/gui/wxAppWithHelpers.cpp
View File

@ -121,11 +121,8 @@ bool wxAppWithHelpers::OnInit()
Connect( pxEvt_MessageBox, pxMessageBoxEventThing (wxAppWithHelpers::OnMessageBox) ); Connect( pxEvt_MessageBox, pxMessageBoxEventThing (wxAppWithHelpers::OnMessageBox) );
Connect( pxEvt_Assertion, pxMessageBoxEventThing (wxAppWithHelpers::OnMessageBox) ); Connect( pxEvt_Assertion, pxMessageBoxEventThing (wxAppWithHelpers::OnMessageBox) );
Connect( pxEvt_Ping, pxPingEventHandler (wxAppWithHelpers::OnPingEvent) ); Connect( pxEvt_Ping, pxPingEventHandler (wxAppWithHelpers::OnPingEvent) );
#ifdef __LINUX__
Connect( wxEVT_IDLE, wxIdleEventHandler (wxAppWithHelpers::OnIdleEvent) ); Connect( wxEVT_IDLE, wxIdleEventHandler (wxAppWithHelpers::OnIdleEvent) );
#else
Connect( wxEvt_Idle, wxIdleEventHandler (wxAppWithHelpers::OnIdleEvent) );
#endif
Connect( m_PingTimer.GetId(), wxEVT_TIMER, wxTimerEventHandler(wxAppWithHelpers::OnPingTimeout) ); Connect( m_PingTimer.GetId(), wxEVT_TIMER, wxTimerEventHandler(wxAppWithHelpers::OnPingTimeout) );
return _parent::OnInit(); return _parent::OnInit();