Return correct invoking window for submenus of a popup menu.

[wxWidgets.git] / include / wx / evtloop.h

diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h
index 7a9495afbfc0ffb613d784634385049185ccf2ee..3ba5c71aed05abe30a9371b88b0ca071851932cb 100644 (file)
--- a/include/wx/evtloop.h
+++ b/include/wx/evtloop.h
@@ -185,7 +185,7 @@ protected:
     wxDECLARE_NO_COPY_CLASS(wxEventLoopBase);
 };
 
     wxDECLARE_NO_COPY_CLASS(wxEventLoopBase);
 };
 

-#if defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXDFB__) || defined(__UNIX__)
+#if defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXDFB__) || (defined(__UNIX__) && !defined(__WXOSX__))

 
 // this class can be used to implement a standard event loop logic using
 // Pending() and Dispatch()
 
 // this class can be used to implement a standard event loop logic using
 // Pending() and Dispatch()


@@ -228,11 +228,6 @@ private:
 
 #endif // platforms using "manual" loop
 
 
 #endif // platforms using "manual" loop
 

-// include the header defining wxConsoleEventLoop for Unix systems
-#if defined(__UNIX__)
-    #include "wx/unix/evtloop.h"
-#endif
-

 // we're moving away from old m_impl wxEventLoop model as otherwise the user
 // code doesn't have access to platform-specific wxEventLoop methods and this
 // can sometimes be very useful (e.g. under MSW this is necessary for
 // we're moving away from old m_impl wxEventLoop model as otherwise the user
 // code doesn't have access to platform-specific wxEventLoop methods and this
 // can sometimes be very useful (e.g. under MSW this is necessary for


@@ -256,7 +251,7 @@ private:
     #include "wx/cocoa/evtloop.h"
 #elif defined(__WXDFB__)
     #include "wx/dfb/evtloop.h"
     #include "wx/cocoa/evtloop.h"
 #elif defined(__WXDFB__)
     #include "wx/dfb/evtloop.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

     #include "wx/gtk/evtloop.h"
 #else // other platform
 
     #include "wx/gtk/evtloop.h"
 #else // other platform
 


@@ -302,6 +297,11 @@ protected:
 
 #endif // wxUSE_GUI
 
 
 #endif // wxUSE_GUI
 

+// include the header defining wxConsoleEventLoop for Unix systems
+#if defined(__UNIX__)
+#include "wx/unix/evtloop.h"
+#endif
+

 #if wxUSE_GUI
     // we use a class rather than a typedef because wxEventLoop is
     // forward-declared in many places
 #if wxUSE_GUI
     // we use a class rather than a typedef because wxEventLoop is
     // forward-declared in many places


@@ -318,7 +318,7 @@ protected:
 
 inline bool wxEventLoopBase::IsRunning() const { return GetActive() == this; }
 
 
 inline bool wxEventLoopBase::IsRunning() const { return GetActive() == this; }
 

-#if wxUSE_GUI
+#if wxUSE_GUI && !defined(__WXOSX__)

 // ----------------------------------------------------------------------------
 // wxModalEventLoop
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxModalEventLoop
 // ----------------------------------------------------------------------------