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

diff --git a/include/wx/mac/carbon/evtloop.h b/include/wx/mac/carbon/evtloop.h
index 653615a2851c296c6881ea52ab064993b69f6988..c13a51836c788246d171bc52d8c55640cbc43680 100644 (file)
--- 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 a40991715ab1ab477d938e4e16fd39ac42a34c54..15bff1bd775101bacf6f0f758d111d19dbcfe8f3 100644 (file)
--- 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 <signal.h>
 #include <unistd.h>
 
@@ -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 1aadf8f4983d03de0dcad32981f8b542084a672f..d9e4100457525d1d272edd16cfd89b0aaa1d7909 100644 (file)
--- 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