Applied patch [ 1382552 ] Fixes GDI-ressource leak in wxStaticBitmap

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

diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h
index 76319e3f1e0ebdd19a101ca7954565bb223de3b7..4a70021ec3b32d2e11e53f659c25676fe2661c76 100644 (file)
--- a/include/wx/evtloop.h
+++ b/include/wx/evtloop.h
@@ -66,6 +66,44 @@ protected:
     DECLARE_NO_COPY_CLASS(wxEventLoopBase)
 };
 
     DECLARE_NO_COPY_CLASS(wxEventLoopBase)
 };
 

+#if defined(__WXMSW__) || defined(__WXMAC__)
+
+// this class can be used to implement a standard event loop logic using
+// Pending() and Dispatch()
+//
+// it also handles idle processing automatically
+class WXDLLEXPORT wxEventLoopManual : public wxEventLoopBase
+{
+public:
+    wxEventLoopManual();
+
+    // enters a loop calling OnNextIteration(), Pending() and Dispatch() and
+    // terminating when Exit() is called
+    virtual int Run();
+
+    // sets the "should exit" flag and wakes up the loop so that it terminates
+    // soon
+    virtual void Exit(int rc = 0);
+
+protected:
+    // implement this to wake up the loop: usually done by posting a dummy event
+    // to it (called from Exit())
+    virtual void WakeUp() = 0;
+
+    // may be overridden to perform some action at the start of each new event
+    // loop iteration
+    virtual void OnNextIteration() { }
+
+
+    // the loop exit code
+    int m_exitcode;
+
+    // should we exit the loop?
+    bool m_shouldExit;
+};
+
+#endif // platforms using "manual" loop
+

 // 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


@@ -75,7 +113,9 @@ protected:
     #include "wx/palmos/evtloop.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/evtloop.h"
     #include "wx/palmos/evtloop.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/evtloop.h"

-#else
+#elif defined(__WXMAC__)
+    #include "wx/mac/evtloop.h"
+#else // other platform

 
 class WXDLLEXPORT wxEventLoopImpl;
 
 
 class WXDLLEXPORT wxEventLoopImpl;
 


@@ -95,9 +135,9 @@ protected:
     wxEventLoopImpl *m_impl;
 
     DECLARE_NO_COPY_CLASS(wxEventLoop)
     wxEventLoopImpl *m_impl;
 
     DECLARE_NO_COPY_CLASS(wxEventLoop)

-        };
+};

 
 

-#endif // __WXMSW__/!__WXMSW__
+#endif // platforms

 
 inline bool wxEventLoopBase::IsRunning() const { return GetActive() == this; }
 
 
 inline bool wxEventLoopBase::IsRunning() const { return GetActive() == this; }