No real changes, just refactor wxControlContainer code a little.

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

diff --git a/src/common/evtloopcmn.cpp b/src/common/evtloopcmn.cpp
index 2399911f685549f84a18487d85c3ea87f4fefbb4..2408d6e26b1e5162db8e5347de951715dfc3a5a6 100644 (file)
--- a/src/common/evtloopcmn.cpp
+++ b/src/common/evtloopcmn.cpp
@@ -2,10 +2,10 @@
 // Name:        src/common/evtloopcmn.cpp
 // Purpose:     common wxEventLoop-related stuff
 // Author:      Vadim Zeitlin
 // Name:        src/common/evtloopcmn.cpp
 // Purpose:     common wxEventLoop-related stuff
 // Author:      Vadim Zeitlin

-// Modified by:

 // Created:     2006-01-12
 // RCS-ID:      $Id$
 // Created:     2006-01-12
 // RCS-ID:      $Id$

-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2006, 2013 Vadim Zeitlin <vadim@wxwindows.org>
+//              (c) 2013 Rob Bresalier

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -124,12 +124,16 @@ wxEventLoopBase::AddSourceForFD(int fd,
                                 wxEventLoopSourceHandler *handler,
                                 int flags)
 {
                                 wxEventLoopSourceHandler *handler,
                                 int flags)
 {

+#if wxUSE_CONSOLE_EVENTLOOP

     // Delegate to the event loop sources manager defined by it.
     wxEventLoopSourcesManagerBase* const
         manager = wxApp::GetValidTraits().GetEventLoopSourcesManager();
     wxCHECK_MSG( manager, NULL, wxS("Must have wxEventLoopSourcesManager") );
 
     return manager->AddSourceForFD(fd, handler, flags);
     // Delegate to the event loop sources manager defined by it.
     wxEventLoopSourcesManagerBase* const
         manager = wxApp::GetValidTraits().GetEventLoopSourcesManager();
     wxCHECK_MSG( manager, NULL, wxS("Must have wxEventLoopSourcesManager") );
 
     return manager->AddSourceForFD(fd, handler, flags);

+#else // !wxUSE_CONSOLE_EVENTLOOP
+    return NULL;
+#endif // wxUSE_CONSOLE_EVENTLOOP/!wxUSE_CONSOLE_EVENTLOOP

 }
 
 #endif // wxUSE_EVENTLOOP_SOURCE
 }
 
 #endif // wxUSE_EVENTLOOP_SOURCE