X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fdf7ff738cb755be0e9e7e1378d8c3073f08f0e1..f363cee882672e147340240cf0bb194a68e37833:/src/common/fdiodispatcher.cpp?ds=sidebyside diff --git a/src/common/fdiodispatcher.cpp b/src/common/fdiodispatcher.cpp index 83573829c1..60938757ed 100644 --- a/src/common/fdiodispatcher.cpp +++ b/src/common/fdiodispatcher.cpp @@ -3,7 +3,6 @@ // Purpose: Implementation of common wxFDIODispatcher methods // Author: Vadim Zeitlin // Created: 2007-05-13 -// RCS-ID: $Id$ // Copyright: (c) 2007 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -58,7 +57,7 @@ wxFDIODispatcher *wxFDIODispatcher::Get() #endif // wxUSE_SELECT_DISPATCHER } - wxASSERT_MSG( gs_dispatcher, _T("failed to create any IO dispatchers") ); + wxASSERT_MSG( gs_dispatcher, "failed to create any IO dispatchers" ); return gs_dispatcher; } @@ -82,11 +81,10 @@ wxFDIOHandler *wxMappedFDIODispatcher::FindHandler(int fd) const } -bool wxMappedFDIODispatcher::RegisterFD(int fd, wxFDIOHandler *handler, int flags) +bool +wxMappedFDIODispatcher::RegisterFD(int fd, wxFDIOHandler *handler, int flags) { - wxUnusedVar(flags); - - wxCHECK_MSG( handler, false, _T("handler can't be NULL") ); + wxCHECK_MSG( handler, false, "handler can't be NULL" ); // notice that it's not an error to register a handler for the same fd // twice as it can be done with different flags -- but it is an error to @@ -95,9 +93,9 @@ bool wxMappedFDIODispatcher::RegisterFD(int fd, wxFDIOHandler *handler, int flag if ( i != m_handlers.end() ) { wxASSERT_MSG( i->second.handler == handler, - _T("registering different handler for the same fd?") ); + "registering different handler for the same fd?" ); wxASSERT_MSG( i->second.flags != flags, - _T("reregistering with the same flags?") ); + "reregistering with the same flags?" ); } m_handlers[fd] = wxFDIOHandlerEntry(handler, flags); @@ -105,15 +103,14 @@ bool wxMappedFDIODispatcher::RegisterFD(int fd, wxFDIOHandler *handler, int flag return true; } -bool wxMappedFDIODispatcher::ModifyFD(int fd, wxFDIOHandler *handler, int flags) +bool +wxMappedFDIODispatcher::ModifyFD(int fd, wxFDIOHandler *handler, int flags) { - wxUnusedVar(flags); - - wxCHECK_MSG( handler, false, _T("handler can't be NULL") ); + wxCHECK_MSG( handler, false, "handler can't be NULL" ); wxFDIOHandlerMap::iterator i = m_handlers.find(fd); wxCHECK_MSG( i != m_handlers.end(), false, - _T("modifying unregistered handler?") ); + "modifying unregistered handler?" ); i->second = wxFDIOHandlerEntry(handler, flags);