don't use wxDELETE unnecessarily

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

diff --git a/include/wx/msw/evtloop.h b/include/wx/msw/evtloop.h
index eec606477b2f195ea2d17dcf9487c4417f110305..2869b07a92449a77532295830e0a4ec3ea83e468 100644 (file)
--- a/include/wx/msw/evtloop.h
+++ b/include/wx/msw/evtloop.h
@@ -12,62 +12,100 @@
 #ifndef _WX_MSW_EVTLOOP_H_
 #define _WX_MSW_EVTLOOP_H_
 
 #ifndef _WX_MSW_EVTLOOP_H_
 #define _WX_MSW_EVTLOOP_H_
 

+#if wxUSE_GUI
+#include "wx/window.h"
+#endif
+

 // ----------------------------------------------------------------------------
 // wxEventLoop
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxEventLoop
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxEventLoop : public wxEventLoopBase
+class WXDLLIMPEXP_BASE wxMSWEventLoopBase : public wxEventLoopManual

 {
 public:
 {
 public:

-    wxEventLoop();
+    wxMSWEventLoopBase();

 
     // implement base class pure virtuals
 
     // implement base class pure virtuals

-    virtual int Run();
-    virtual void Exit(int rc = 0);

     virtual bool Pending() const;
     virtual bool Pending() const;

-    virtual bool Dispatch();
-    virtual bool IsRunning() const;

 
 

-    // MSW-specific methods
-    // --------------------
+protected:
+    // get the next message from queue and return true or return false if we
+    // got WM_QUIT or an error occurred
+    bool GetNextMessage(WXMSG *msg);
+
+    // same as above but with a timeout and return value can be -1 meaning that
+    // time out expired in addition to
+    int GetNextMessageTimeout(WXMSG *msg, unsigned long timeout);
+};
+
+#if wxUSE_GUI
+
+class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxMSWEventLoopBase
+{
+public:
+    wxGUIEventLoop() { }
+
+    // process a single message: calls PreProcessMessage() before dispatching
+    // it
+    virtual void ProcessMessage(WXMSG *msg);

 
     // preprocess a message, return true if processed (i.e. no further
     // dispatching required)
     virtual bool PreProcessMessage(WXMSG *msg);
 
 
     // preprocess a message, return true if processed (i.e. no further
     // dispatching required)
     virtual bool PreProcessMessage(WXMSG *msg);
 

-    // process a single message
-    virtual void ProcessMessage(WXMSG *msg);
-

     // set the critical window: this is the window such that all the events
     // except those to this window (and its children) stop to be processed
     // (typical examples: assert or crash report dialog)
     //
     // calling this function with NULL argument restores the normal event
     // handling
     // set the critical window: this is the window such that all the events
     // except those to this window (and its children) stop to be processed
     // (typical examples: assert or crash report dialog)
     //
     // calling this function with NULL argument restores the normal event
     // handling

-    static void SetCriticalWindow(wxWindow *win) { ms_winCritical = win; }
+    static void SetCriticalWindow(wxWindowMSW *win) { ms_winCritical = win; }

 
     // return true if there is no critical window or if this window is [a child
     // of] the critical one
 
     // return true if there is no critical window or if this window is [a child
     // of] the critical one

-    static bool AllowProcessing(wxWindow *win)
+    static bool AllowProcessing(wxWindowMSW *win)

     {
         return !ms_winCritical || IsChildOfCriticalWindow(win);
     }
 
     {
         return !ms_winCritical || IsChildOfCriticalWindow(win);
     }
 

+    // override/implement base class virtuals
+    virtual bool Dispatch();
+    virtual int DispatchTimeout(unsigned long timeout);
+    virtual void WakeUp();
+

 protected:
 protected:

+    virtual void OnNextIteration();
+
+private:

     // check if the given window is a child of ms_winCritical (which must be
     // non NULL)
     // check if the given window is a child of ms_winCritical (which must be
     // non NULL)

-    static bool IsChildOfCriticalWindow(wxWindow *win);
+    static bool IsChildOfCriticalWindow(wxWindowMSW *win);

 
 
     // critical window or NULL
 
 
     // critical window or NULL

-    static wxWindow *ms_winCritical;
+    static wxWindowMSW *ms_winCritical;
+};
+
+#else // !wxUSE_GUI

 
 

-    // the loop exit code
-    int m_exitcode;
+#if wxUSE_CONSOLE_EVENTLOOP
+
+class WXDLLIMPEXP_BASE wxConsoleEventLoop : public wxMSWEventLoopBase
+{
+public:
+    wxConsoleEventLoop() { }

 
 

-    // should we exit the loop?
-    bool m_shouldExit;
+    // override/implement base class virtuals
+    virtual bool Dispatch();
+    virtual int DispatchTimeout(unsigned long timeout);
+    virtual void WakeUp();
+
+    // MSW-specific function to process a single message
+    virtual void ProcessMessage(WXMSG *msg);

 };
 
 };
 

-#endif // _WX_MSW_EVTLOOP_H_
+#endif // wxUSE_CONSOLE_EVENTLOOP
+
+#endif // wxUSE_GUI/!wxUSE_GUI

 
 

+#endif // _WX_MSW_EVTLOOP_H_