projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
adapting ownership semantics to cocoa convention
[wxWidgets.git]
/
src
/
msw
/
evtloop.cpp
diff --git
a/src/msw/evtloop.cpp
b/src/msw/evtloop.cpp
index 0d57104c33524b8aaaaea5249da025af51b69b38..6e734bc53f19955202266623ae3e22708a84b5ad 100644
(file)
--- a/
src/msw/evtloop.cpp
+++ b/
src/msw/evtloop.cpp
@@
-1,12
+1,12
@@
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
-// Name: msw/evtloop.cpp
+// Name:
src/
msw/evtloop.cpp
// Purpose: implements wxEventLoop for MSW
// Author: Vadim Zeitlin
// Modified by:
// Created: 01.06.01
// RCS-ID: $Id$
// Copyright: (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Purpose: implements wxEventLoop for MSW
// Author: Vadim Zeitlin
// Modified by:
// Created: 01.06.01
// RCS-ID: $Id$
// Copyright: (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licen
s
e: wxWindows licence
+// Licen
c
e: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
@@
-401,7
+401,7
@@
bool wxGUIEventLoop::YieldFor(long eventsToProcess)
if ((eventsToProcess & wxEVT_CATEGORY_UI) == 0)
{
// this msg is not going to be dispatched...
if ((eventsToProcess & wxEVT_CATEGORY_UI) == 0)
{
// this msg is not going to be dispatched...
- // however WM_PAINT is special: until there are damaged
+ // however WM_PAINT is special: until there are damaged
// windows, Windows will keep sending it forever!
if (nPaintsReceived > 10)
{
// windows, Windows will keep sending it forever!
if (nPaintsReceived > 10)
{
@@
-429,7
+429,9
@@
bool wxGUIEventLoop::YieldFor(long eventsToProcess)
wxEventCategory cat;
switch (msg.message)
{
wxEventCategory cat;
switch (msg.message)
{
+#if !defined(__WXWINCE__)
case WM_NCMOUSEMOVE:
case WM_NCMOUSEMOVE:
+
case WM_NCLBUTTONDOWN:
case WM_NCLBUTTONUP:
case WM_NCLBUTTONDBLCLK:
case WM_NCLBUTTONDOWN:
case WM_NCLBUTTONUP:
case WM_NCLBUTTONDBLCLK:
@@
-439,6
+441,7
@@
bool wxGUIEventLoop::YieldFor(long eventsToProcess)
case WM_NCMBUTTONDOWN:
case WM_NCMBUTTONUP:
case WM_NCMBUTTONDBLCLK:
case WM_NCMBUTTONDOWN:
case WM_NCMBUTTONUP:
case WM_NCMBUTTONDBLCLK:
+#endif
case WM_KEYDOWN:
case WM_KEYUP:
case WM_KEYDOWN:
case WM_KEYUP:
@@
-467,11
+470,13
@@
bool wxGUIEventLoop::YieldFor(long eventsToProcess)
case WM_IME_KEYDOWN:
case WM_IME_KEYUP:
case WM_IME_KEYDOWN:
case WM_IME_KEYUP:
+#if !defined(__WXWINCE__)
case WM_MOUSEHOVER:
case WM_MOUSEHOVER:
+ case WM_MOUSELEAVE:
+#endif
#ifdef WM_NCMOUSELEAVE
case WM_NCMOUSELEAVE:
#endif
#ifdef WM_NCMOUSELEAVE
case WM_NCMOUSELEAVE:
#endif
- case WM_MOUSELEAVE:
case WM_CUT:
case WM_COPY:
case WM_CUT:
case WM_COPY:
@@
-560,16
+565,7
@@
void wxConsoleEventLoop::WakeUp()
void wxConsoleEventLoop::ProcessMessage(WXMSG *msg)
{
void wxConsoleEventLoop::ProcessMessage(WXMSG *msg)
{
- if ( msg->message == WM_TIMER )
- {
- TIMERPROC proc = (TIMERPROC)msg->lParam;
- if ( proc )
- (*proc)(NULL, 0, msg->wParam, 0);
- }
- else
- {
- ::DispatchMessage(msg);
- }
+ ::DispatchMessage(msg);
}
bool wxConsoleEventLoop::Dispatch()
}
bool wxConsoleEventLoop::Dispatch()