From f6342fb5e6524edffa219d5843536ea279bba4df Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 16 May 2007 23:12:40 +0000 Subject: [PATCH] Apply parts of patch #1719888 to fix compilation on Mac and with monolithic builds git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/mac/carbon/evtloop.h | 1 - src/unix/appunix.cpp | 6 ++++++ src/unix/evtloopunix.cpp | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/include/wx/mac/carbon/evtloop.h b/include/wx/mac/carbon/evtloop.h index 653615a285..c13a51836c 100644 --- a/include/wx/mac/carbon/evtloop.h +++ b/include/wx/mac/carbon/evtloop.h @@ -54,7 +54,6 @@ public: virtual bool Pending() const; virtual bool Dispatch(); -protected: // implement base class pure virtual virtual void WakeUp(); }; diff --git a/src/unix/appunix.cpp b/src/unix/appunix.cpp index a40991715a..15bff1bd77 100644 --- a/src/unix/appunix.cpp +++ b/src/unix/appunix.cpp @@ -12,6 +12,10 @@ #include "wx/log.h" #include "wx/evtloop.h" +//this code should not be compiled when GUI is defined +//(monolithic build issue) +#if !wxUSE_GUI + #include #include @@ -75,3 +79,5 @@ bool wxAppConsoleUnix::SetSignalHandler(int signal, SignalHandler handler) return true; } + +#endif // !wxUSE_GUI diff --git a/src/unix/evtloopunix.cpp b/src/unix/evtloopunix.cpp index 1aadf8f498..d9e4100457 100644 --- a/src/unix/evtloopunix.cpp +++ b/src/unix/evtloopunix.cpp @@ -35,6 +35,10 @@ #define TRACE_EVENTS _T("events") +//this code should not be compiled when GUI is defined +//(monolithic build issue) +#if !wxUSE_GUI + // =========================================================================== // wxEventLoop::PipeIOHandler implementation // =========================================================================== @@ -190,3 +194,4 @@ void wxConsoleEventLoop::OnNextIteration() wxTheApp->CheckSignal(); } +#endif // !wxUSE_GUI -- 2.45.2