make wxSelectDispatcher ctor public, it can be useful to create it in places other...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/private/selectdispatcher.h b/include/wx/private/selectdispatcher.h
index 9d75cdd77f2807ca6059d84f45dc7d2e03348263..9ee71d4f9fb11b34d1d1fc12587a5ac95e196dc3 100644 (file)
--- a/include/wx/private/selectdispatcher.h
+++ b/include/wx/private/selectdispatcher.h
@@ -82,8 +82,8 @@ private:
 class WXDLLIMPEXP_BASE wxSelectDispatcher : public wxMappedFDIODispatcher
 {
 public:
-    // creates an instance of this class, the caller takes ownership of it
-    static wxSelectDispatcher *Create();
+    // default ctor
+    wxSelectDispatcher() { m_maxFD = -1; }
 
     // implement pure virtual methods of the base class
     virtual bool RegisterFD(int fd, wxFDIOHandler *handler, int flags = wxFDIO_ALL);
@@ -91,10 +91,6 @@ public:
     virtual bool UnregisterFD(int fd);
     virtual void Dispatch(int timeout = TIMEOUT_INFINITE);
 
-protected:
-    // ctor is not public, use Create()
-    wxSelectDispatcher();
-
 private:
     // common part of RegisterFD() and ModifyFD()
     bool DoUpdateFDAndHandler(int fd, wxFDIOHandler *handler, int flags);

diff --git a/src/common/fdiodispatcher.cpp b/src/common/fdiodispatcher.cpp
index 65c862cf880f36105d6a63890385fb3fedf08333..83573829c108adbbad34b578d165b334f9508b23 100644 (file)
--- a/src/common/fdiodispatcher.cpp
+++ b/src/common/fdiodispatcher.cpp
@@ -54,7 +54,7 @@ wxFDIODispatcher *wxFDIODispatcher::Get()
         if ( !gs_dispatcher )
 #endif // wxUSE_EPOLL_DISPATCHER
 #if wxUSE_SELECT_DISPATCHER
-            gs_dispatcher = wxSelectDispatcher::Create();
+            gs_dispatcher = new wxSelectDispatcher();
 #endif // wxUSE_SELECT_DISPATCHER
     }
 

diff --git a/src/common/selectdispatcher.cpp b/src/common/selectdispatcher.cpp
index d3461b2b2f68525c29f246079648d591d6a2c856..ffcf38717912bd16ad42dec7075fbaf77bb1a761 100644 (file)
--- a/src/common/selectdispatcher.cpp
+++ b/src/common/selectdispatcher.cpp
@@ -131,17 +131,6 @@ void wxSelectSets::Handle(int fd, wxFDIOHandler& handler) const
 // wxSelectDispatcher
 // ----------------------------------------------------------------------------
 
-/* static */
-wxSelectDispatcher *wxSelectDispatcher::Create()
-{
-    return new wxSelectDispatcher;
-}
-
-wxSelectDispatcher::wxSelectDispatcher()
-{
-    m_maxFD = -1;
-}
-
 bool wxSelectDispatcher::RegisterFD(int fd, wxFDIOHandler *handler, int flags)
 {
     if ( !wxMappedFDIODispatcher::RegisterFD(fd, handler, flags) )