#if wxUSE_THREADS
#include "wx/thread.h"
- // define the array of MSG strutures
- WX_DECLARE_OBJARRAY(MSG, wxMsgArray);
+ // define the list of MSG strutures
+ WX_DECLARE_LIST(MSG, wxMsgList);
- #include "wx/arrimpl.cpp"
+ #include "wx/listimpl.cpp"
- WX_DEFINE_OBJARRAY(wxMsgArray);
+ WX_DEFINE_LIST(wxMsgList);
#endif // wxUSE_THREADS
-// ----------------------------------------------------------------------------
-// wxEventLoopImpl
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxEventLoopImpl
-{
-public:
- // ctor
- wxEventLoopImpl() { m_exitcode = 0; m_shouldExit = false; }
-
- // process a message
- void ProcessMessage(MSG *msg);
-
- // generate an idle message, return TRUE if more idle time requested
- bool SendIdleMessage();
-
- // set/get the exit code
- void Exit(int exitcode) { m_exitcode = exitcode; m_shouldExit = true; }
- int GetExitCode() const { return m_exitcode; }
- bool ShouldExit() const { return m_shouldExit; }
-
-private:
- // preprocess a message, return TRUE if processed (i.e. no further
- // dispatching required)
- bool PreProcessMessage(MSG *msg);
-
- // the exit code of the event loop
- int m_exitcode;
-
- // true if we were asked to terminate
- bool m_shouldExit;
-};
-
// ----------------------------------------------------------------------------
// helper class
// ----------------------------------------------------------------------------
-wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoopImpl);
-
// this object sets the wxEventLoop given to the ctor as the currently active
// one and unsets it in its dtor
class wxEventLoopActivator
};
// ============================================================================
-// wxEventLoopImpl implementation
+// wxEventLoop implementation
// ============================================================================
+wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL;
+
+// ----------------------------------------------------------------------------
+// ctor/dtor
+// ----------------------------------------------------------------------------
+
+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) )
}
}
-bool wxEventLoopImpl::PreProcessMessage(MSG *msg)
+bool wxEventLoop::PreProcessMessage(WXMSG *msg)
{
HWND hwnd = msg->hwnd;
wxWindow *wndThis = wxGetWindowFromHWND((WXHWND)hwnd);
if ( !wndThis )
{
// we need to find the dialog containing this control as
- // IsDialogMessage() just eats all the messages (i.e. returns TRUE for
+ // 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 )
{
// 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
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
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) )
- return TRUE;
+ if (wnd != wndThis) // Skip the first since wndThis->MSWProcessMessage() was called above
+ {
+ if ( wnd->MSWProcessMessage((WXMSG *)msg) )
+ return true;
+ }
+
+ // Stop at first top level window (as per comment above).
+ // 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
- return FALSE;
-}
-
-// ----------------------------------------------------------------------------
-// wxEventLoopImpl idle event processing
-// ----------------------------------------------------------------------------
-
-bool wxEventLoopImpl::SendIdleMessage()
-{
- return wxTheApp && wxTheApp->ProcessIdle();
+ return false;
}
-// ============================================================================
-// wxEventLoop implementation
-// ============================================================================
-
-wxEventLoop *wxEventLoop::ms_activeLoop = NULL;
-
// ----------------------------------------------------------------------------
// wxEventLoop running and exiting
// ----------------------------------------------------------------------------
-wxEventLoop::~wxEventLoop()
-{
- wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
-}
-
bool wxEventLoop::IsRunning() const
{
- return m_impl != NULL;
+ return ms_activeLoop == this;
}
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") );
- // SendIdleMessage() and Dispatch() below may throw so the code here should
+ // ProcessIdle() and Dispatch() below may throw so the code here should
// be exception-safe, hence we must use local objects for all actions we
// should undo
wxEventLoopActivator activate(&ms_activeLoop, this);
- wxEventLoopImplTiedPtr impl(&m_impl, new wxEventLoopImpl);
// we must ensure that OnExit() is called even if an exception is thrown
// from inside Dispatch() but we must call it from Exit() in normal
// generate and process idle events for as long as we don't
// have anything else to do
- while ( !Pending() && m_impl->SendIdleMessage() )
+ while ( !Pending() && (wxTheApp && wxTheApp->ProcessIdle()) )
;
// if the "should exit" flag is set, the loop should terminate
// but not before processing any remaining messages so while
// Pending() returns true, do process them
- if ( m_impl->ShouldExit() )
+ if ( m_shouldExit )
{
while ( Pending() )
Dispatch();
}
#endif // wxUSE_EXCEPTIONS
- return m_impl->GetExitCode();
+ return m_exitcode;
}
void wxEventLoop::Exit(int rc)
{
wxCHECK_RET( IsRunning(), _T("can't call Exit() if not running") );
- m_impl->Exit(rc);
+ m_exitcode = rc;
+ m_shouldExit = true;
OnExit();
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);
if ( rc == 0 )
{
// got WM_QUIT
- return FALSE;
+ return false;
}
if ( rc == -1 )
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") );
- 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() )
{
- 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 )
{
- s_aSavedMessages.Add(msg);
+ MSG* pMsg = new MSG(msg);
+ s_aSavedMessages.Append(pMsg);
}
- return TRUE;
+ return true;
}
else
{
// 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
- m_impl->ProcessMessage(&msg);
+ ProcessMessage(&msg);
- return TRUE;
+ return true;
}
projects / wxWidgets.git / blobdiff