ignore WinCE projects and build directories

[wxWidgets.git] / src / msw / basemsw.cpp

diff --git a/src/msw/basemsw.cpp b/src/msw/basemsw.cpp
index 1989549dc18bc594d4b77649e04d37fdbab4f4ed..5308abebe3eb0c239d77b23948f5b9c3388bbacd 100644 (file)
--- a/src/msw/basemsw.cpp
+++ b/src/msw/basemsw.cpp
@@ -41,6 +41,8 @@
 // wxAppTraits implementation
 // ============================================================================
 
 // wxAppTraits implementation
 // ============================================================================
 

+GSocketManager *wxAppTraits::ms_manager = NULL;
+

 WXDWORD wxAppTraits::DoSimpleWaitForThread(WXHANDLE hThread)
 {
     return ::WaitForSingleObject((HANDLE)hThread, INFINITE);
 WXDWORD wxAppTraits::DoSimpleWaitForThread(WXHANDLE hThread)
 {
     return ::WaitForSingleObject((HANDLE)hThread, INFINITE);


@@ -82,16 +84,25 @@ bool wxConsoleAppTraits::DoMessageFromThreadWait()
     return true;
 }
 
     return true;
 }
 

+#if wxUSE_TIMER
+

 wxTimerImpl *wxConsoleAppTraits::CreateTimerImpl(wxTimer *timer)
 {
     return new wxMSWTimerImpl(timer);
 }
 
 wxTimerImpl *wxConsoleAppTraits::CreateTimerImpl(wxTimer *timer)
 {
     return new wxMSWTimerImpl(timer);
 }
 

-wxEventLoop *wxConsoleAppTraits::CreateEventLoop()
+#endif // wxUSE_TIMER
+
+wxEventLoopBase *wxConsoleAppTraits::CreateEventLoop()

 {
 {

+#if wxUSE_CONSOLE_EVENTLOOP

     return new wxEventLoop();
     return new wxEventLoop();

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

 }
 
 }
 

+

 WXDWORD wxConsoleAppTraits::WaitForThread(WXHANDLE hThread)
 {
     return DoSimpleWaitForThread(hThread);
 WXDWORD wxConsoleAppTraits::WaitForThread(WXHANDLE hThread)
 {
     return DoSimpleWaitForThread(hThread);