#endif
#ifndef WX_PRECOMP
- #include "wx/window.h"
+ #if wxUSE_GUI
+ #include "wx/window.h"
+ #endif
#include "wx/app.h"
#endif //WX_PRECOMP
#include "wx/evtloop.h"
-
-#include "wx/tooltip.h"
+#include "wx/thread.h"
#include "wx/except.h"
#include "wx/ptr_scpd.h"
-
#include "wx/msw/private.h"
-#if wxUSE_THREADS
- #include "wx/thread.h"
+#if wxUSE_GUI
+ #include "wx/tooltip.h"
+ #if wxUSE_THREADS
+ // define the list of MSG strutures
+ WX_DECLARE_LIST(MSG, wxMsgList);
- // define the list of MSG strutures
- WX_DECLARE_LIST(MSG, wxMsgList);
+ #include "wx/listimpl.cpp"
- #include "wx/listimpl.cpp"
+ WX_DEFINE_LIST(wxMsgList)
+ #endif // wxUSE_THREADS
+#endif //wxUSE_GUI
- WX_DEFINE_LIST(wxMsgList)
-#endif // wxUSE_THREADS
+#if wxUSE_BASE
// ============================================================================
-// wxEventLoop implementation
+// wxMSWEventLoopBase implementation
// ============================================================================
-wxWindowMSW *wxEventLoop::ms_winCritical = NULL;
-
// ----------------------------------------------------------------------------
// ctor/dtor
// ----------------------------------------------------------------------------
-wxEventLoop::wxEventLoop()
+wxMSWEventLoopBase::wxMSWEventLoopBase()
{
m_shouldExit = false;
m_exitcode = 0;
}
// ----------------------------------------------------------------------------
-// wxEventLoop message processing
+// wxEventLoop message processing dispatching
// ----------------------------------------------------------------------------
-void wxEventLoop::ProcessMessage(WXMSG *msg)
+bool wxMSWEventLoopBase::Pending() const
{
- // give us the chance to preprocess the message first
- if ( !PreProcessMessage(msg) )
+ MSG msg;
+ return ::PeekMessage(&msg, 0, 0, 0, PM_NOREMOVE) != 0;
+}
+
+bool wxMSWEventLoopBase::GetNextMessage(WXMSG* msg)
+{
+ wxCHECK_MSG( IsRunning(), false, _T("can't get messages if not running") );
+
+ const BOOL rc = ::GetMessage(msg, NULL, 0, 0);
+
+ if ( rc == 0 )
{
- // if it wasn't done, dispatch it to the corresponding window
- ::TranslateMessage(msg);
- ::DispatchMessage(msg);
+ // got WM_QUIT
+ return false;
+ }
+
+ if ( rc == -1 )
+ {
+ // should never happen, but let's test for it nevertheless
+ wxLogLastError(wxT("GetMessage"));
+
+ // still break from the loop
+ return false;
}
+
+ return true;
}
-bool wxEventLoop::IsChildOfCriticalWindow(wxWindowMSW *win)
+#endif // wxUSE_BASE
+
+#if wxUSE_GUI
+
+// ============================================================================
+// GUI wxEventLoop implementation
+// ============================================================================
+
+wxWindowMSW *wxGUIEventLoop::ms_winCritical = NULL;
+
+bool wxGUIEventLoop::IsChildOfCriticalWindow(wxWindowMSW *win)
{
while ( win )
{
return false;
}
-bool wxEventLoop::PreProcessMessage(WXMSG *msg)
+bool wxGUIEventLoop::PreProcessMessage(WXMSG *msg)
{
HWND hwnd = msg->hwnd;
wxWindow *wndThis = wxGetWindowFromHWND((WXHWND)hwnd);
// now try the other hooks (kbd navigation is handled here)
for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )
{
- if (wnd != wndThis) // Skip the first since wndThis->MSWProcessMessage() was called above
- {
- if ( wnd->MSWProcessMessage((WXMSG *)msg) )
- return true;
- }
+ 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())
+ // 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;
}
return false;
}
-// ----------------------------------------------------------------------------
-// wxEventLoop running and exiting
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// wxEventLoopManual customization
-// ----------------------------------------------------------------------------
-
-void wxEventLoop::OnNextIteration()
-{
-#if wxUSE_THREADS
- wxMutexGuiLeaveOrEnter();
-#endif // wxUSE_THREADS
-}
-
-void wxEventLoop::WakeUp()
+void wxGUIEventLoop::ProcessMessage(WXMSG *msg)
{
- ::PostMessage(NULL, WM_NULL, 0, 0);
-}
-
-// ----------------------------------------------------------------------------
-// wxEventLoop message processing dispatching
-// ----------------------------------------------------------------------------
-
-bool wxEventLoop::Pending() const
-{
- MSG msg;
- return ::PeekMessage(&msg, 0, 0, 0, PM_NOREMOVE) != 0;
+ // give us the chance to preprocess the message first
+ if ( !PreProcessMessage(msg) )
+ {
+ // if it wasn't done, dispatch it to the corresponding window
+ ::TranslateMessage(msg);
+ ::DispatchMessage(msg);
+ }
}
-bool wxEventLoop::Dispatch()
+bool wxGUIEventLoop::Dispatch()
{
- 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
+ if ( !GetNextMessage(&msg) )
return false;
- }
-
- if ( rc == -1 )
- {
- // should never happen, but let's test for it nevertheless
- wxLogLastError(wxT("GetMessage"));
-
- // still break from the loop
- return false;
- }
#if wxUSE_THREADS
wxASSERT_MSG( wxThread::IsMain(),
return true;
}
+void wxGUIEventLoop::OnNextIteration()
+{
+#if wxUSE_THREADS
+ wxMutexGuiLeaveOrEnter();
+#endif // wxUSE_THREADS
+}
+
+void wxGUIEventLoop::WakeUp()
+{
+ ::PostMessage(NULL, WM_NULL, 0, 0);
+}
+
+#else // !wxUSE_GUI
+
+#if wxUSE_CONSOLE_EVENTLOOP
+
+void wxConsoleEventLoop::OnNextIteration()
+{
+ if ( wxTheApp )
+ wxTheApp->ProcessPendingEvents();
+}
+
+void wxConsoleEventLoop::WakeUp()
+{
+#if wxUSE_THREADS
+ wxWakeUpMainThread();
+#endif
+}
+
+bool wxConsoleEventLoop::Dispatch()
+{
+ MSG msg;
+ if ( !GetNextMessage(&msg) )
+ return false;
+
+ if ( msg.message == WM_TIMER )
+ {
+ TIMERPROC proc = (TIMERPROC)msg.lParam;
+ if ( proc )
+ (*proc)(NULL, 0, msg.wParam, 0);
+ }
+ else
+ {
+ ::DispatchMessage(&msg);
+ }
+
+ return !m_shouldExit;
+}
+
+#endif // wxUSE_CONSOLE_EVENTLOOP
+
+#endif //wxUSE_GUI
projects / wxWidgets.git / blobdiff