X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2dc62891c42229d26e0cb1b5c3fb6e37750c01d3..835a347314148e6facab05ceb51c14c704a0d8a7:/include/wx/app.h

diff --git a/include/wx/app.h b/include/wx/app.h
index 38878cf44d..8b813caa33 100644
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -34,13 +34,7 @@ class WXDLLIMPEXP_BASE wxCmdLineParser;
 class WXDLLIMPEXP_BASE wxLog;
 class WXDLLIMPEXP_BASE wxMessageOutput;
 
-// wxUSE_EVTLOOP_IN_APP is a temporary hack needed until all ports are updated
-// to use wxEventLoop, otherwise we get linking errors on wxMac, it's going to
-// disappear a.s.a.p.
-#ifdef __WXMAC__
-    #define wxUSE_EVTLOOP_IN_APP 0
-#else
-    #define wxUSE_EVTLOOP_IN_APP 1
+#if wxUSE_GUI
     class WXDLLEXPORT wxEventLoop;
 #endif
 
@@ -373,12 +367,8 @@ public:
         // (already) be dispatched
     static bool IsMainLoopRunning()
     {
-#if wxUSE_EVTLOOP_IN_APP
         wxAppBase *app = wx_static_cast(wxAppBase *, GetInstance());
         return app && app->m_mainLoop != NULL;
-#else
-        return false;
-#endif
     }
 
         // execute the main GUI loop, the function returns when the loop ends
@@ -521,11 +511,9 @@ protected:
     virtual wxAppTraits *CreateTraits();
 
 
-#if wxUSE_EVTLOOP_IN_APP
     // the main event loop of the application (may be NULL if the loop hasn't
     // been started yet or has already terminated)
     wxEventLoop *m_mainLoop;
-#endif // wxUSE_EVTLOOP_IN_APP
 
     // the main top level window (may be NULL)
     wxWindow *m_topWindow;
@@ -567,8 +555,10 @@ protected:
         #include "wx/motif/app.h"
     #elif defined(__WXMGL__)
         #include "wx/mgl/app.h"
-    #elif defined(__WXGTK__)
+    #elif defined(__WXGTK20__)
         #include "wx/gtk/app.h"
+    #elif defined(__WXGTK__)
+        #include "wx/gtk1/app.h"
     #elif defined(__WXX11__)
         #include "wx/x11/app.h"
     #elif defined(__WXMAC__)