remove wxMSW-specific (but copied into wxPalm too) wxAppTraits::AlwaysYield(), it's useless now that wxEventLoop is in wxBase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -26,9 +26,6 @@ public:
|
||||
// some opaque data which will be passed later to AfterChildWaitLoop()
|
||||
virtual void *BeforeChildWaitLoop() = 0;
|
||||
|
||||
// process pending Windows messages, even in console app
|
||||
virtual void AlwaysYield() = 0;
|
||||
|
||||
// called after starting to wait for the child termination, the parameter
|
||||
// is the return value of BeforeChildWaitLoop()
|
||||
virtual void AfterChildWaitLoop(void *data) = 0;
|
||||
|
@@ -21,7 +21,6 @@ class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase
|
||||
public:
|
||||
virtual wxEventLoopBase *CreateEventLoop();
|
||||
virtual void *BeforeChildWaitLoop();
|
||||
virtual void AlwaysYield();
|
||||
virtual void AfterChildWaitLoop(void *data);
|
||||
#if wxUSE_TIMER
|
||||
virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
|
||||
@@ -41,7 +40,6 @@ class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
|
||||
public:
|
||||
virtual wxEventLoopBase *CreateEventLoop();
|
||||
virtual void *BeforeChildWaitLoop();
|
||||
virtual void AlwaysYield();
|
||||
virtual void AfterChildWaitLoop(void *data);
|
||||
#if wxUSE_TIMER
|
||||
virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
|
||||
|
@@ -26,9 +26,6 @@ public:
|
||||
// some opaque data which will be passed later to AfterChildWaitLoop()
|
||||
virtual void *BeforeChildWaitLoop() = 0;
|
||||
|
||||
// process pending Windows messages, even in console app
|
||||
virtual void AlwaysYield() = 0;
|
||||
|
||||
// called after starting to wait for the child termination, the parameter
|
||||
// is the return value of BeforeChildWaitLoop()
|
||||
virtual void AfterChildWaitLoop(void *data) = 0;
|
||||
|
@@ -27,7 +27,6 @@ public:
|
||||
virtual wxEventLoopBase *CreateEventLoop();
|
||||
#endif // wxUSE_CONSOLE_EVENTLOOP
|
||||
virtual void *BeforeChildWaitLoop();
|
||||
virtual void AlwaysYield();
|
||||
virtual void AfterChildWaitLoop(void *data);
|
||||
#if wxUSE_TIMER
|
||||
virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) { return new wxPalmOSTimerImpl(timer); }
|
||||
@@ -43,7 +42,6 @@ class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
|
||||
public:
|
||||
virtual wxEventLoopBase *CreateEventLoop();
|
||||
virtual void *BeforeChildWaitLoop();
|
||||
virtual void AlwaysYield();
|
||||
virtual void AfterChildWaitLoop(void *data);
|
||||
#if wxUSE_TIMER
|
||||
// there is no wxTimer support yet
|
||||
|
@@ -200,11 +200,6 @@ void *wxGUIAppTraits::BeforeChildWaitLoop()
|
||||
return new ChildWaitLoopData(wd, winActive);
|
||||
}
|
||||
|
||||
void wxGUIAppTraits::AlwaysYield()
|
||||
{
|
||||
wxYield();
|
||||
}
|
||||
|
||||
void wxGUIAppTraits::AfterChildWaitLoop(void *dataOrig)
|
||||
{
|
||||
wxEndBusyCursor();
|
||||
|
@@ -52,21 +52,6 @@ WXDWORD wxAppTraits::DoSimpleWaitForThread(WXHANDLE hThread)
|
||||
// wxConsoleAppTraits implementation
|
||||
// ============================================================================
|
||||
|
||||
void wxConsoleAppTraits::AlwaysYield()
|
||||
{
|
||||
// we need to use special logic to deal with WM_PAINT: as this pseudo
|
||||
// message is generated automatically as long as there are invalidated
|
||||
// windows belonging to this thread, we'd never return if we waited here
|
||||
// until we have no more of them left. OTOH, this message is always the
|
||||
// last one in the queue, so we can safely return as soon as we detect it
|
||||
MSG msg;
|
||||
while ( ::PeekMessage(&msg, NULL, 0, 0, PM_REMOVE) )
|
||||
{
|
||||
if ( msg.message == WM_PAINT )
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void *wxConsoleAppTraits::BeforeChildWaitLoop()
|
||||
{
|
||||
// nothing to do here
|
||||
|
@@ -100,11 +100,6 @@ void *wxGUIAppTraits::BeforeChildWaitLoop()
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void wxGUIAppTraits::AlwaysYield()
|
||||
{
|
||||
wxYield();
|
||||
}
|
||||
|
||||
void wxGUIAppTraits::AfterChildWaitLoop(void *dataOrig)
|
||||
{
|
||||
}
|
||||
|
@@ -35,10 +35,6 @@
|
||||
// wxConsoleAppTraits implementation
|
||||
// ============================================================================
|
||||
|
||||
void wxConsoleAppTraits::AlwaysYield()
|
||||
{
|
||||
}
|
||||
|
||||
void *wxConsoleAppTraits::BeforeChildWaitLoop()
|
||||
{
|
||||
return NULL;
|
||||
|
Reference in New Issue
Block a user