Minor header cleaning.

[wxWidgets.git] / src / msw / evtloop.cpp

diff --git a/src/msw/evtloop.cpp b/src/msw/evtloop.cpp
index a36caa946dfa4a1bc8a54bddec951be45fb99661..37b2eba9a4ce179ddbcd9985c85c7ec229383cd2 100644 (file)
--- a/src/msw/evtloop.cpp
+++ b/src/msw/evtloop.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "evtloop.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -34,56 +30,45 @@
 #endif //WX_PRECOMP
 
 #include "wx/evtloop.h"
 #endif //WX_PRECOMP
 
 #include "wx/evtloop.h"

+

 #include "wx/tooltip.h"
 #include "wx/tooltip.h"

+#include "wx/except.h"
+#include "wx/ptr_scpd.h"

 
 #include "wx/msw/private.h"
 
 #if wxUSE_THREADS
 
 #include "wx/msw/private.h"
 
 #if wxUSE_THREADS

-    // define the array of MSG strutures
-    WX_DECLARE_OBJARRAY(MSG, wxMsgArray);
-    // VS: this is a bit dirty - it duplicates same declaration in app.cpp
-    //     (and there's no WX_DEFINE_OBJARRAY for that reason - it is already
-    //     defined in app.cpp).
-#endif
-
-// ----------------------------------------------------------------------------
-// wxEventLoopImpl
-// ----------------------------------------------------------------------------
+    #include "wx/thread.h"

 
 

-class WXDLLEXPORT wxEventLoopImpl
-{
-public:
-    // ctor
-    wxEventLoopImpl() { SetExitCode(0); }
+    // define the list of MSG strutures
+    WX_DECLARE_LIST(MSG, wxMsgList);

 
 

-    // process a message
-    void ProcessMessage(MSG *msg);
+    #include "wx/listimpl.cpp"

 
 

-    // generate an idle message, return TRUE if more idle time requested
-    bool SendIdleMessage();
+    WX_DEFINE_LIST(wxMsgList)
+#endif // wxUSE_THREADS

 
 

-    // set/get the exit code
-    void SetExitCode(int exitcode) { m_exitcode = exitcode; }
-    int GetExitCode() const { return m_exitcode; }
+// ============================================================================
+// wxEventLoop implementation
+// ============================================================================

 
 

-private:
-    // preprocess a message, return TRUE if processed (i.e. no further
-    // dispatching required)
-    bool PreProcessMessage(MSG *msg);
+wxWindowMSW *wxEventLoop::ms_winCritical = NULL;

 
 

-    // the exit code of the event loop
-    int m_exitcode;
-};
+// ----------------------------------------------------------------------------
+// ctor/dtor
+// ----------------------------------------------------------------------------

 
 

-// ============================================================================
-// wxEventLoopImpl implementation
-// ============================================================================
+wxEventLoop::wxEventLoop()
+{
+    m_shouldExit = false;
+    m_exitcode = 0;
+}

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// wxEventLoopImpl message processing
+// wxEventLoop message processing

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-void wxEventLoopImpl::ProcessMessage(MSG *msg)
+void wxEventLoop::ProcessMessage(WXMSG *msg)

 {
     // give us the chance to preprocess the message first
     if ( !PreProcessMessage(msg) )
 {
     // give us the chance to preprocess the message first
     if ( !PreProcessMessage(msg) )


@@ -94,25 +79,61 @@ void wxEventLoopImpl::ProcessMessage(MSG *msg)
     }
 }
 
     }
 }
 

-bool wxEventLoopImpl::PreProcessMessage(MSG *msg)
+bool wxEventLoop::IsChildOfCriticalWindow(wxWindowMSW *win)
+{
+    while ( win )
+    {
+        if ( win == ms_winCritical )
+            return true;
+
+        win = win->GetParent();
+    }
+
+    return false;
+}
+
+bool wxEventLoop::PreProcessMessage(WXMSG *msg)

 {
     HWND hwnd = msg->hwnd;
     wxWindow *wndThis = wxGetWindowFromHWND((WXHWND)hwnd);
 {
     HWND hwnd = msg->hwnd;
     wxWindow *wndThis = wxGetWindowFromHWND((WXHWND)hwnd);

+    wxWindow *wnd;

 
 

-    // this may happen if the event occured in a standard modeless dialog (the
-    // only example of which I know of is the find/replace dialog) - then call
-    // IsDialogMessage() to make TAB navigation in it work
+    // this might happen if we're in a modeless dialog, or if a wx control has
+    // children which themselves were not created by wx (i.e. wxActiveX control children)

     if ( !wndThis )
     {
     if ( !wndThis )
     {

-        // we need to find the dialog containing this control as
-        // IsDialogMessage() just eats all the messages (i.e. returns TRUE for
-        // them) if we call it for the control itself
-        while ( hwnd && ::GetWindowLong(hwnd, GWL_STYLE) & WS_CHILD )
+        while ( hwnd && (::GetWindowLong(hwnd, GWL_STYLE) & WS_CHILD ))

         {
             hwnd = ::GetParent(hwnd);
         {
             hwnd = ::GetParent(hwnd);

+
+            // If the control has a wx parent, break and give the parent a chance
+            // to process the window message
+            wndThis = wxGetWindowFromHWND((WXHWND)hwnd);
+            if (wndThis != NULL)
+                break;

         }
 
         }
 

-        return hwnd && ::IsDialogMessage(hwnd, msg) != 0;
+        if ( !wndThis )
+        {
+            // this may happen if the event occurred in a standard modeless dialog (the
+            // only example of which I know of is the find/replace dialog) - then call
+            // IsDialogMessage() to make TAB navigation in it work
+
+            // NOTE: IsDialogMessage() just eats all the messages (i.e. returns true for
+            // them) if we call it for the control itself
+            return hwnd && ::IsDialogMessage(hwnd, msg) != 0;
+        }
+    }
+
+    if ( !AllowProcessing(wndThis) )
+    {
+        // not a child of critical window, so we eat the event but take care to
+        // stop an endless stream of WM_PAINTs which would have resulted if we
+        // didn't validate the invalidated part of the window
+        if ( msg->message == WM_PAINT )
+            ::ValidateRect(hwnd, NULL);
+
+        return true;

     }
 
 #if wxUSE_TOOLTIPS
     }
 
 #if wxUSE_TOOLTIPS


@@ -120,11 +141,10 @@ bool wxEventLoopImpl::PreProcessMessage(MSG *msg)
     // popup the tooltip bubbles
     if ( msg->message == WM_MOUSEMOVE )
     {
     // popup the tooltip bubbles
     if ( msg->message == WM_MOUSEMOVE )
     {

-        wxToolTip *tt = wndThis->GetToolTip();
-        if ( tt )
-        {
-            tt->RelayEvent((WXMSG *)msg);
-        }
+        // we should do it if one of window children has an associated tooltip
+        // (and not just if the window has a tooltip itself)
+        if ( wndThis->HasToolTips() )
+            wxToolTip::RelayEvent((WXMSG *)msg);

     }
 #endif // wxUSE_TOOLTIPS
 
     }
 #endif // wxUSE_TOOLTIPS
 


@@ -133,16 +153,14 @@ bool wxEventLoopImpl::PreProcessMessage(MSG *msg)
     // grab Ctrl-C/V/X, even if they are also accelerators in some parent)
     if ( !wndThis->MSWShouldPreProcessMessage((WXMSG *)msg) )
     {
     // grab Ctrl-C/V/X, even if they are also accelerators in some parent)
     if ( !wndThis->MSWShouldPreProcessMessage((WXMSG *)msg) )
     {

-        return FALSE;
+        return false;

     }
 
     // try translations first: the accelerators override everything
     }
 
     // try translations first: the accelerators override everything

-    wxWindow *wnd;
-

     for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )
     {
         if ( wnd->MSWTranslateMessage((WXMSG *)msg))
     for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )
     {
         if ( wnd->MSWTranslateMessage((WXMSG *)msg))

-            return TRUE;
+            return true;

 
         // stop at first top level window, i.e. don't try to process the key
         // strokes originating in a dialog using the accelerators of the parent
 
         // stop at first top level window, i.e. don't try to process the key
         // strokes originating in a dialog using the accelerators of the parent


@@ -151,94 +169,42 @@ bool wxEventLoopImpl::PreProcessMessage(MSG *msg)
             break;
     }
 
             break;
     }
 

-    // now try the other hooks (kbd navigation is handled here): we start from
-    // wndThis->GetParent() because wndThis->MSWProcessMessage() was already
-    // called above
-    for ( wnd = wndThis->GetParent(); wnd; wnd = wnd->GetParent() )
+    // now try the other hooks (kbd navigation is handled here)
+    for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )

     {
         if ( wnd->MSWProcessMessage((WXMSG *)msg) )
     {
         if ( wnd->MSWProcessMessage((WXMSG *)msg) )

-            return TRUE;
+            return true;
+
+        // also stop at first top level window here, just as above because
+        // if we don't do this, pressing ESC on a modal dialog shown as child
+        // of a modal dialog with wxID_CANCEL will cause the parent dialog to
+        // be closed, for example
+        if ( wnd->IsTopLevel() )
+            break;

     }
 
     // no special preprocessing for this message, dispatch it normally
     }
 
     // no special preprocessing for this message, dispatch it normally

-    return FALSE;
+    return false;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// wxEventLoopImpl idle event processing
+// wxEventLoop running and exiting

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-bool wxEventLoopImpl::SendIdleMessage()
-{
-    return wxTheApp->ProcessIdle();
-}
-
-// ============================================================================
-// wxEventLoop implementation
-// ============================================================================
-
-wxEventLoop *wxEventLoop::ms_activeLoop = NULL;
-

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-// wxEventLoop running and exiting
+// wxEventLoopManual customization

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-wxEventLoop::~wxEventLoop()
+void wxEventLoop::OnNextIteration()

 {
 {

-    wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
-}
-
-bool wxEventLoop::IsRunning() const
-{
-    return m_impl != NULL;
-}
-
-int wxEventLoop::Run()
-{
-    // event loops are not recursive, you need to create another loop!
-    wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
-
-    m_impl = new wxEventLoopImpl;
-    
-    wxEventLoop *oldLoop = ms_activeLoop;
-    ms_activeLoop = this;
-
-    for ( ;; )
-    {

 #if wxUSE_THREADS
 #if wxUSE_THREADS

-        wxMutexGuiLeaveOrEnter();
+    wxMutexGuiLeaveOrEnter();

 #endif // wxUSE_THREADS
 #endif // wxUSE_THREADS

-
-        // generate and process idle events for as long as we don't have
-        // anything else to do
-        while ( !Pending() && m_impl->SendIdleMessage() )
-            ;
-
-        // a message came or no more idle processing to do, sit in Dispatch()
-        // waiting for the next message
-        if ( !Dispatch() )
-        {
-            // we got WM_QUIT
-            break;
-        }
-    }
-
-    int exitcode = m_impl->GetExitCode();
-    delete m_impl;
-    m_impl = NULL;
-
-    ms_activeLoop = oldLoop;
-
-    return exitcode;

 }
 
 }
 

-void wxEventLoop::Exit(int rc)
+void wxEventLoop::WakeUp()

 {
 {

-    wxCHECK_RET( IsRunning(), _T("can't call Exit() if not running") );
-
-    m_impl->SetExitCode(rc);
-
-    ::PostQuitMessage(rc);
+    ::PostMessage(NULL, WM_NULL, 0, 0);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -253,7 +219,7 @@ bool wxEventLoop::Pending() const
 
 bool wxEventLoop::Dispatch()
 {
 
 bool wxEventLoop::Dispatch()
 {

-    wxCHECK_MSG( IsRunning(), FALSE, _T("can't call Dispatch() if not running") );
+    wxCHECK_MSG( IsRunning(), false, _T("can't call Dispatch() if not running") );

 
     MSG msg;
     BOOL rc = ::GetMessage(&msg, (HWND) NULL, 0, 0);
 
     MSG msg;
     BOOL rc = ::GetMessage(&msg, (HWND) NULL, 0, 0);


@@ -261,7 +227,7 @@ bool wxEventLoop::Dispatch()
     if ( rc == 0 )
     {
         // got WM_QUIT
     if ( rc == 0 )
     {
         // got WM_QUIT

-        return FALSE;
+        return false;

     }
 
     if ( rc == -1 )
     }
 
     if ( rc == -1 )


@@ -270,31 +236,32 @@ bool wxEventLoop::Dispatch()
         wxLogLastError(wxT("GetMessage"));
 
         // still break from the loop
         wxLogLastError(wxT("GetMessage"));
 
         // still break from the loop

-        return FALSE;
+        return false;

     }
 
 #if wxUSE_THREADS
     wxASSERT_MSG( wxThread::IsMain(),
                   wxT("only the main thread can process Windows messages") );
 
     }
 
 #if wxUSE_THREADS
     wxASSERT_MSG( wxThread::IsMain(),
                   wxT("only the main thread can process Windows messages") );
 

-    static bool s_hadGuiLock = TRUE;
-    static wxMsgArray s_aSavedMessages;
+    static bool s_hadGuiLock = true;
+    static wxMsgList s_aSavedMessages;

 
     // if a secondary thread owning the mutex is doing GUI calls, save all
     // messages for later processing - we can't process them right now because
     // it will lead to recursive library calls (and we're not reentrant)
     if ( !wxGuiOwnedByMainThread() )
     {
 
     // if a secondary thread owning the mutex is doing GUI calls, save all
     // messages for later processing - we can't process them right now because
     // it will lead to recursive library calls (and we're not reentrant)
     if ( !wxGuiOwnedByMainThread() )
     {

-        s_hadGuiLock = FALSE;
+        s_hadGuiLock = false;

 
         // leave out WM_COMMAND messages: too dangerous, sometimes
         // the message will be processed twice
         if ( !wxIsWaitingForThread() || msg.message != WM_COMMAND )
         {
 
         // leave out WM_COMMAND messages: too dangerous, sometimes
         // the message will be processed twice
         if ( !wxIsWaitingForThread() || msg.message != WM_COMMAND )
         {

-            s_aSavedMessages.Add(msg);
+            MSG* pMsg = new MSG(msg);
+            s_aSavedMessages.Append(pMsg);

         }
 
         }
 

-        return TRUE;
+        return true;

     }
     else
     {
     }
     else
     {


@@ -305,22 +272,25 @@ bool wxEventLoop::Dispatch()
         //       messages normally - expect some things to break...
         if ( !s_hadGuiLock )
         {
         //       messages normally - expect some things to break...
         if ( !s_hadGuiLock )
         {

-            s_hadGuiLock = TRUE;
+            s_hadGuiLock = true;

 
 

-            size_t count = s_aSavedMessages.Count();
-            for ( size_t n = 0; n < count; n++ )
+            wxMsgList::compatibility_iterator node = s_aSavedMessages.GetFirst();
+            while (node)

             {
             {

-                MSG& msg = s_aSavedMessages[n];
-                m_impl->ProcessMessage(&msg);
-            }
+                MSG* pMsg = node->GetData();
+                s_aSavedMessages.Erase(node);

 
 

-            s_aSavedMessages.Empty();
+                ProcessMessage(pMsg);
+                delete pMsg;
+
+                node = s_aSavedMessages.GetFirst();
+            }

         }
     }
 #endif // wxUSE_THREADS
 
         }
     }
 #endif // wxUSE_THREADS
 

-    m_impl->ProcessMessage(&msg);
+    ProcessMessage(&msg);

 
 

-    return TRUE;
+    return true;

 }
 
 }