Implement SelectAll for OSX WebKit.

[wxWidgets.git] / include / wx / unix / evtloop.h

diff --git a/include/wx/unix/evtloop.h b/include/wx/unix/evtloop.h
index 35d918390c6547bc9cea9946c873ba6a21547535..f2b0a102c88c8fe9eec8c4d1e704296433eb18a8 100644 (file)
--- a/include/wx/unix/evtloop.h
+++ b/include/wx/unix/evtloop.h
@@ -1,4 +1,4 @@
-    ///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////

 // Name:        wx/unix/evtloop.h
 // Purpose:     declares wxEventLoop class
 // Author:      Lukasz Michalski (lm@zork.pl)
 // Name:        wx/unix/evtloop.h
 // Purpose:     declares wxEventLoop class
 // Author:      Lukasz Michalski (lm@zork.pl)


@@ -18,17 +18,21 @@
 // ----------------------------------------------------------------------------
 
 class wxFDIODispatcher;
 // ----------------------------------------------------------------------------
 
 class wxFDIODispatcher;

+class wxUnixEventLoopSource;

 
 namespace wxPrivate
 {
     class PipeIOHandler;
 }
 
 
 namespace wxPrivate
 {
     class PipeIOHandler;
 }
 

-class WXDLLIMPEXP_BASE wxConsoleEventLoop : public wxEventLoopManual
+class WXDLLIMPEXP_BASE wxConsoleEventLoop
+#ifdef __WXOSX__
+: public wxCFEventLoop
+#else
+: public wxEventLoopManual
+#endif

 {
 public:
 {
 public:

-    typedef wxUnixEventLoopSource Source;
-

     // initialize the event loop, use IsOk() to check if we were successful
     wxConsoleEventLoop();
     virtual ~wxConsoleEventLoop();
     // initialize the event loop, use IsOk() to check if we were successful
     wxConsoleEventLoop();
     virtual ~wxConsoleEventLoop();


@@ -42,26 +46,11 @@ public:
     virtual bool YieldFor(long WXUNUSED(eventsToProcess)) { return true; }
 
 #if wxUSE_EVENTLOOP_SOURCE
     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:
 
 protected:

-#if wxUSE_EVENTLOOP_SOURCE
-    // adding/removing sources
-    virtual bool DoAddSource(wxAbstractEventLoopSource* source);
-    virtual bool DoRemoveSource(wxAbstractEventLoopSource* source);
-#endif
-

     virtual void OnNextIteration();
 
 private:
     virtual void OnNextIteration();
 
 private: