Compilation fix for gcc-4 and newer.

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

diff --git a/include/wx/msw/evtloop.h b/include/wx/msw/evtloop.h
index fe75758c14bd0975d04f3ba1a4a5785ff954dd63..fd548b87f25aa3bf6fada941a6e954a182010e58 100644 (file)
--- a/include/wx/msw/evtloop.h
+++ b/include/wx/msw/evtloop.h
@@ -12,31 +12,43 @@
 #ifndef _WX_MSW_EVTLOOP_H_
 #define _WX_MSW_EVTLOOP_H_
 
+#if wxUSE_GUI
+#include "wx/window.h"
+#endif
+
 // ----------------------------------------------------------------------------
 // wxEventLoop
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxEventLoop : public wxEventLoopBase
+class WXDLLIMPEXP_BASE wxMSWEventLoopBase : public wxEventLoopManual
 {
 public:
-    wxEventLoop();
+    wxMSWEventLoopBase();
 
     // implement base class pure virtuals
-    virtual int Run();
-    virtual void Exit(int rc = 0);
     virtual bool Pending() const;
-    virtual bool Dispatch();
 
-    // 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);
+};
+
+#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);
 
-    // 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)
@@ -52,7 +64,14 @@ public:
         return !ms_winCritical || IsChildOfCriticalWindow(win);
     }
 
+    // override/implement base class virtuals
+    virtual bool Dispatch();
+    virtual void WakeUp();
+
 protected:
+    virtual void OnNextIteration();
+
+private:
     // check if the given window is a child of ms_winCritical (which must be
     // non NULL)
     static bool IsChildOfCriticalWindow(wxWindowMSW *win);
@@ -60,13 +79,27 @@ protected:
 
     // critical window or NULL
     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 void WakeUp();
+
+protected:
+    virtual void OnNextIteration();
 };
 
-#endif // _WX_MSW_EVTLOOP_H_
+#endif // wxUSE_CONSOLE_EVENTLOOP
+
+#endif // wxUSE_GUI/!wxUSE_GUI
 
+#endif // _WX_MSW_EVTLOOP_H_