Close wxDataViewCtrl inline editor when destroying the control.

[wxWidgets.git] / src / common / selectdispatcher.cpp

diff --git a/src/common/selectdispatcher.cpp b/src/common/selectdispatcher.cpp
index 1d3a1d600a6363bf021439acdaf9b9aadc623cd1..fd0a26938cb2e328204842cee0cf00022b990afe 100644 (file)
--- a/src/common/selectdispatcher.cpp
+++ b/src/common/selectdispatcher.cpp
@@ -5,7 +5,7 @@
 // Created:     December 2006
 // RCS-ID:      $Id$
 // Copyright:   (c) 2006 Lukasz Michalski
 // Created:     December 2006
 // RCS-ID:      $Id$
 // Copyright:   (c) 2006 Lukasz Michalski

-// License:     wxWindows licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -34,11 +34,6 @@
     #include "wx/intl.h"
 #endif
 
     #include "wx/intl.h"
 #endif
 

-#if defined(HAVE_SYS_SELECT_H) || defined(__WATCOMC__)
-    #include <sys/time.h>
-    #include <sys/select.h>
-#endif
-

 #include <errno.h>
 
 #define wxSelectDispatcher_Trace wxT("selectdispatcher")
 #include <errno.h>
 
 #define wxSelectDispatcher_Trace wxT("selectdispatcher")


@@ -93,7 +88,7 @@ bool wxSelectSets::HasFD(int fd) const
 
 bool wxSelectSets::SetFD(int fd, int flags)
 {
 
 bool wxSelectSets::SetFD(int fd, int flags)
 {

-    wxCHECK_MSG( fd >= 0, false, _T("invalid descriptor") );
+    wxCHECK_MSG( fd >= 0, false, wxT("invalid descriptor") );

 
     for ( int n = 0; n < Max; n++ )
     {
 
     for ( int n = 0; n < Max; n++ )
     {


@@ -122,7 +117,7 @@ bool wxSelectSets::Handle(int fd, wxFDIOHandler& handler) const
         if ( wxFD_ISSET(fd, (fd_set*) &m_fds[n]) )
         {
             wxLogTrace(wxSelectDispatcher_Trace,
         if ( wxFD_ISSET(fd, (fd_set*) &m_fds[n]) )
         {
             wxLogTrace(wxSelectDispatcher_Trace,

-                       _T("Got %s event on fd %d"), ms_names[n], fd);
+                       wxT("Got %s event on fd %d"), ms_names[n], fd);

             (handler.*ms_handlers[n])();
             // callback can modify sets and destroy handler
             // this forces that one event can be processed at one time
             (handler.*ms_handlers[n])();
             // callback can modify sets and destroy handler
             // this forces that one event can be processed at one time


@@ -149,7 +144,7 @@ bool wxSelectDispatcher::RegisterFD(int fd, wxFDIOHandler *handler, int flags)
       m_maxFD = fd;
 
     wxLogTrace(wxSelectDispatcher_Trace,
       m_maxFD = fd;
 
     wxLogTrace(wxSelectDispatcher_Trace,

-                _T("Registered fd %d: input:%d, output:%d, exceptional:%d"), fd, (flags & wxFDIO_INPUT) == wxFDIO_INPUT, (flags & wxFDIO_OUTPUT), (flags & wxFDIO_EXCEPTION) == wxFDIO_EXCEPTION);
+                wxT("Registered fd %d: input:%d, output:%d, exceptional:%d"), fd, (flags & wxFDIO_INPUT) == wxFDIO_INPUT, (flags & wxFDIO_OUTPUT), (flags & wxFDIO_EXCEPTION) == wxFDIO_EXCEPTION);

     return true;
 }
 
     return true;
 }
 


@@ -158,10 +153,10 @@ bool wxSelectDispatcher::ModifyFD(int fd, wxFDIOHandler *handler, int flags)
     if ( !wxMappedFDIODispatcher::ModifyFD(fd, handler, flags) )
         return false;
 
     if ( !wxMappedFDIODispatcher::ModifyFD(fd, handler, flags) )
         return false;
 

-    wxASSERT_MSG( fd <= m_maxFD, _T("logic error: registered fd > m_maxFD?") );
+    wxASSERT_MSG( fd <= m_maxFD, wxT("logic error: registered fd > m_maxFD?") );

 
     wxLogTrace(wxSelectDispatcher_Trace,
 
     wxLogTrace(wxSelectDispatcher_Trace,

-                _T("Modified fd %d: input:%d, output:%d, exceptional:%d"), fd, (flags & wxFDIO_INPUT) == wxFDIO_INPUT, (flags & wxFDIO_OUTPUT) == wxFDIO_OUTPUT, (flags & wxFDIO_EXCEPTION) == wxFDIO_EXCEPTION);
+                wxT("Modified fd %d: input:%d, output:%d, exceptional:%d"), fd, (flags & wxFDIO_INPUT) == wxFDIO_INPUT, (flags & wxFDIO_OUTPUT) == wxFDIO_OUTPUT, (flags & wxFDIO_EXCEPTION) == wxFDIO_EXCEPTION);

     return m_sets.SetFD(fd, flags);
 }
 
     return m_sets.SetFD(fd, flags);
 }
 


@@ -192,7 +187,7 @@ bool wxSelectDispatcher::UnregisterFD(int fd)
     }
 
     wxLogTrace(wxSelectDispatcher_Trace,
     }
 
     wxLogTrace(wxSelectDispatcher_Trace,

-                _T("Removed fd %d, current max: %d"), fd, m_maxFD);
+                wxT("Removed fd %d, current max: %d"), fd, m_maxFD);

     return true;
 }
 
     return true;
 }
 


@@ -207,7 +202,7 @@ int wxSelectDispatcher::ProcessSets(const wxSelectSets& sets)
         wxFDIOHandler * const handler = FindHandler(fd);
         if ( !handler )
         {
         wxFDIOHandler * const handler = FindHandler(fd);
         if ( !handler )
         {

-            wxFAIL_MSG( _T("NULL handler in wxSelectDispatcher?") );
+            wxFAIL_MSG( wxT("NULL handler in wxSelectDispatcher?") );

             continue;
         }
 
             continue;
         }
 


@@ -225,8 +220,8 @@ int wxSelectDispatcher::DoSelect(wxSelectSets& sets, int timeout) const
     if ( timeout != TIMEOUT_INFINITE )
     {
         ptv = &tv;
     if ( timeout != TIMEOUT_INFINITE )
     {
         ptv = &tv;

-        tv.tv_sec = 0;
-        tv.tv_usec = timeout*1000;
+        tv.tv_sec = timeout / 1000;
+        tv.tv_usec = (timeout % 1000)*1000;

     }
     else // no timeout
     {
     }
     else // no timeout
     {