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 bc8ea3d0771e1366980c8e0089cb36264400673d..cb2de4ac713df4c1622ee35f61039d1c75b7e0ee 100644 (file)
--- a/include/wx/evtloop.h
+++ b/include/wx/evtloop.h
@@ -39,10 +39,10 @@ public:
     // exit from the loop with the given exit code
     virtual void Exit(int rc = 0) = 0;
 
     // exit from the loop with the given exit code
     virtual void Exit(int rc = 0) = 0;
 

-    // return TRUE if any events are available
+    // return true if any events are available

     virtual bool Pending() const = 0;
 
     virtual bool Pending() const = 0;
 

-    // dispatch a single event, return FALSE if we should exit from the loop
+    // dispatch a single event, return false if we should exit from the loop

     virtual bool Dispatch() = 0;
 
     // is the event loop running now?
     virtual bool Dispatch() = 0;
 
     // is the event loop running now?


@@ -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.
 // 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
 
     #include "wx/msw/evtloop.h"
 #else
 


@@ -83,12 +85,12 @@ class WXDLLEXPORT wxEventLoop : public wxEventLoopBase
 public:
     wxEventLoop() { m_impl = NULL; }
     virtual ~wxEventLoop();
 public:
     wxEventLoop() { m_impl = NULL; }
     virtual ~wxEventLoop();

-    
+

     virtual int Run();
     virtual void Exit(int rc = 0);
     virtual bool Pending() const;
     virtual bool Dispatch();
     virtual int Run();
     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
 
 protected:
     // the pointer to the port specific implementation class