X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af49c4b8a2d3553e733e71c7dd3911881f4c1a2a..401e3b6e5f50f15571b86297b5d1e3f55c473f6f:/include/wx/evtloop.h

diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h
index 80f0916e85..bc8ea3d077 100644
--- a/include/wx/evtloop.h
+++ b/include/wx/evtloop.h
@@ -12,38 +12,42 @@
 #ifndef _WX_EVTLOOP_H_
 #define _WX_EVTLOOP_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "evtloop.h"
 #endif
 
+#include "wx/utils.h"
+
+class WXDLLEXPORT wxEventLoop;
+
 // ----------------------------------------------------------------------------
 // wxEventLoop: a GUI event loop
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxEventLoop
+class WXDLLEXPORT wxEventLoopBase
 {
 public:
-    // ctor
-    wxEventLoop() { m_impl = NULL; }
+    // trivial, but needed (because of wxEventLoopBase) ctor
+    wxEventLoopBase() { }
 
     // dtor
-    virtual ~wxEventLoop();
+    virtual ~wxEventLoopBase() { }
 
     // start the event loop, return the exit code when it is finished
-    virtual int Run();
+    virtual int Run() = 0;
 
     // exit from the loop with the given exit code
-    virtual void Exit(int rc = 0);
+    virtual void Exit(int rc = 0) = 0;
 
     // return TRUE if any events are available
-    virtual bool Pending() const;
+    virtual bool Pending() const = 0;
 
     // dispatch a single event, return FALSE if we should exit from the loop
-    virtual bool Dispatch();
+    virtual bool Dispatch() = 0;
 
     // is the event loop running now?
-    virtual bool IsRunning() const;
-    
+    virtual bool IsRunning() const = 0;
+
     // return currently active (running) event loop, may be NULL
     static wxEventLoop *GetActive() { return ms_activeLoop; }
 
@@ -51,10 +55,77 @@ public:
     static void SetActive(wxEventLoop* loop) { ms_activeLoop = loop; }
 
 protected:
-    // the pointer to the port specific implementation class
-    class WXDLLEXPORT wxEventLoopImpl *m_impl;
+    // this function should be called before the event loop terminates, whether
+    // this happens normally (because of Exit() call) or abnormally (because of
+    // an exception thrown from inside the loop)
+    virtual void OnExit() { }
+
+
     // the pointer to currently active loop
     static wxEventLoop *ms_activeLoop;
+
+    DECLARE_NO_COPY_CLASS(wxEventLoopBase)
+};
+
+// 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
+// integration with MFC) but currently this is done for MSW only, other ports
+// should follow a.s.a.p.
+#ifdef __WXMSW__
+    #include "wx/msw/evtloop.h"
+#else
+
+class WXDLLEXPORT wxEventLoopImpl;
+
+class WXDLLEXPORT wxEventLoop : public wxEventLoopBase
+{
+public:
+    wxEventLoop() { m_impl = NULL; }
+    virtual ~wxEventLoop();
+    
+    virtual int Run();
+    virtual void Exit(int rc = 0);
+    virtual bool Pending() const;
+    virtual bool Dispatch();
+    virtual bool IsRunning() const { return m_impl != NULL; }
+
+protected:
+    // the pointer to the port specific implementation class
+    wxEventLoopImpl *m_impl;
+
+    DECLARE_NO_COPY_CLASS(wxEventLoop)
+        };
+
+#endif // __WXMSW__/!__WXMSW__
+
+// ----------------------------------------------------------------------------
+// wxModalEventLoop
+// ----------------------------------------------------------------------------
+
+// this is a naive generic implementation which uses wxWindowDisabler to
+// implement modality, we will surely need platform-specific implementations
+// too, this generic implementation is here only temporarily to see how it
+// works
+class WXDLLEXPORT wxModalEventLoop : public wxEventLoop
+{
+public:
+    wxModalEventLoop(wxWindow *winModal)
+    {
+        m_windowDisabler = new wxWindowDisabler(winModal);
+    }
+
+protected:
+    virtual void OnExit()
+    {
+        delete m_windowDisabler;
+        m_windowDisabler = NULL;
+
+        wxEventLoop::OnExit();
+    }
+
+private:
+    wxWindowDisabler *m_windowDisabler;
 };
 
 #endif // _WX_EVTLOOP_H_