No changes, just remove unnecessary wxPickerBase::OnSize().

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

diff --git a/include/wx/msw/evtloop.h b/include/wx/msw/evtloop.h
index a5c7720028aefcc2142558a48eece8c9e8568733..5c89e304bd80b29f3a44677d73b71b2b5ec2ca21 100644 (file)
--- a/include/wx/msw/evtloop.h
+++ b/include/wx/msw/evtloop.h
@@ -12,32 +12,51 @@
 #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/dynarray.h"
+#include "wx/msw/wrapwin.h"
+#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
+
+WX_DECLARE_EXPORTED_OBJARRAY(MSG, wxMSGArray);
+
+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)
     // 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)


@@ -53,21 +72,48 @@ public:
         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();
+    virtual bool YieldFor(long eventsToProcess);
+

 protected:
 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);
 
     // check if the given window is a child of ms_winCritical (which must be
     // non NULL)
     static bool IsChildOfCriticalWindow(wxWindowMSW *win);
 

+    // array of messages used for temporary storage by YieldFor()
+    wxMSGArray m_arrMSG;

 
     // critical window or NULL
     static wxWindowMSW *ms_winCritical;
 
     // critical window or NULL
     static wxWindowMSW *ms_winCritical;

+};
+
+#else // !wxUSE_GUI
+
+#if wxUSE_CONSOLE_EVENTLOOP
+
+class WXDLLIMPEXP_BASE wxConsoleEventLoop : public wxMSWEventLoopBase
+{
+public:
+    wxConsoleEventLoop() { }

 
 

-    // the loop exit code
-    int m_exitcode;
+    // override/implement base class virtuals
+    virtual bool Dispatch();
+    virtual int DispatchTimeout(unsigned long timeout);
+    virtual void WakeUp();
+    virtual bool YieldFor(long WXUNUSED(eventsToProcess)) { return true; }

 
 

-    // should we exit the loop?
-    bool m_shouldExit;
+    // 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_