Refactor wxEventLoopSource-related code.
Currently wxEventLoopSource can't be created directly and can only be used to monitor file descriptors so reduce the API to just wxEventLoop::AddSourceForFD() and remove AddSource(), RemoveSource() and RemoveAllSources() which couldn't be implemented for all ports. This makes the code much simpler without any loss of functionality. Make wxEventLoopSource responsible for removing itself from the event loop when it is deleted. This allows to remove IsOk() and Invalidate() methods making the code simpler and gets rid of various sets/maps which were used before. This also allows to support event loop sources in Carbon as well: wxOSX/Carbon now compiles and works with wxUSE_FSWATCHER==1. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// Name: wx/unix/evtloop.h
|
||||
// Purpose: declares wxEventLoop class
|
||||
// Author: Lukasz Michalski (lm@zork.pl)
|
||||
@@ -18,6 +18,7 @@
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class wxFDIODispatcher;
|
||||
class wxUnixEventLoopSource;
|
||||
|
||||
namespace wxPrivate
|
||||
{
|
||||
@@ -27,8 +28,6 @@ namespace wxPrivate
|
||||
class WXDLLIMPEXP_BASE wxConsoleEventLoop : public wxEventLoopManual
|
||||
{
|
||||
public:
|
||||
typedef wxUnixEventLoopSource Source;
|
||||
|
||||
// initialize the event loop, use IsOk() to check if we were successful
|
||||
wxConsoleEventLoop();
|
||||
virtual ~wxConsoleEventLoop();
|
||||
@@ -42,26 +41,11 @@ public:
|
||||
virtual bool YieldFor(long WXUNUSED(eventsToProcess)) { return true; }
|
||||
|
||||
#if wxUSE_EVENTLOOP_SOURCE
|
||||
virtual wxUnixEventLoopSource* CreateSource() const
|
||||
{
|
||||
return new wxUnixEventLoopSource();
|
||||
}
|
||||
|
||||
virtual wxUnixEventLoopSource* CreateSource(int res,
|
||||
wxEventLoopSourceHandler* handler,
|
||||
int flags) const
|
||||
{
|
||||
return new wxUnixEventLoopSource(res, handler, flags);
|
||||
}
|
||||
#endif
|
||||
virtual wxEventLoopSource *
|
||||
AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags);
|
||||
#endif // wxUSE_EVENTLOOP_SOURCE
|
||||
|
||||
protected:
|
||||
#if wxUSE_EVENTLOOP_SOURCE
|
||||
// adding/removing sources
|
||||
virtual bool DoAddSource(wxAbstractEventLoopSource* source);
|
||||
virtual bool DoRemoveSource(wxAbstractEventLoopSource* source);
|
||||
#endif
|
||||
|
||||
virtual void OnNextIteration();
|
||||
|
||||
private:
|
||||
|
Reference in New Issue
Block a user