applied heavily modified patch 1116702: support for specifying disabled toolbar image...

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

diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h
index 42b00f2d03f85a03d350f96017cd2848e64c6115..cb2de4ac713df4c1622ee35f61039d1c75b7e0ee 100644 (file)
--- a/include/wx/evtloop.h
+++ b/include/wx/evtloop.h
@@ -72,7 +72,9 @@ protected:
 // can sometimes be very useful (e.g. under MSW this is necessary for
 // integration with MFC) but currently this is done for MSW only, other ports
 // should follow a.s.a.p.
-#ifdef __WXMSW__
+#if defined(__WXPALMOS__)
+    #include "wx/palmos/evtloop.h"
+#elif defined(__WXMSW__)
     #include "wx/msw/evtloop.h"
 #else
 
@@ -88,7 +90,7 @@ public:
     virtual void Exit(int rc = 0);
     virtual bool Pending() const;
     virtual bool Dispatch();
-    virtual bool IsRunning() const { return m_impl != NULL; }
+    virtual bool IsRunning() const { return GetActive() == this; }
 
 protected:
     // the pointer to the port specific implementation class