Remove unneeded KeepWaiting() and AfterWait() functions
These functions were never used anywhere and their meaning was not clear, so just drop them. Also remove the now unused "tested" member and "WAIT_DURATION" constant.
This commit is contained in:
@@ -202,8 +202,6 @@ EventGenerator* EventGenerator::ms_instance = 0;
|
|||||||
class FSWTesterBase : public wxEvtHandler
|
class FSWTesterBase : public wxEvtHandler
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
enum { WAIT_DURATION = 3 };
|
|
||||||
|
|
||||||
FSWTesterBase(int types = wxFSW_EVENT_ALL) :
|
FSWTesterBase(int types = wxFSW_EVENT_ALL) :
|
||||||
eg(EventGenerator::Get()),
|
eg(EventGenerator::Get()),
|
||||||
m_eventTypes(types)
|
m_eventTypes(types)
|
||||||
@@ -291,30 +289,6 @@ public:
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual bool KeepWaiting()
|
|
||||||
{
|
|
||||||
// did we receive event already?
|
|
||||||
if (!tested)
|
|
||||||
{
|
|
||||||
// well, let's wait a bit more
|
|
||||||
wxSleep(WAIT_DURATION);
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual bool AfterWait()
|
|
||||||
{
|
|
||||||
// fail if still no events
|
|
||||||
WX_ASSERT_MESSAGE
|
|
||||||
(
|
|
||||||
("No events during %d seconds!", static_cast<int>(WAIT_DURATION)),
|
|
||||||
tested
|
|
||||||
);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void OnFileSystemEvent(wxFileSystemWatcherEvent& evt)
|
virtual void OnFileSystemEvent(wxFileSystemWatcherEvent& evt)
|
||||||
{
|
{
|
||||||
wxLogDebug("--- %s ---", evt.ToString());
|
wxLogDebug("--- %s ---", evt.ToString());
|
||||||
@@ -322,7 +296,6 @@ public:
|
|||||||
|
|
||||||
// test finished
|
// test finished
|
||||||
SendIdle();
|
SendIdle();
|
||||||
tested = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void CheckResult()
|
virtual void CheckResult()
|
||||||
@@ -390,7 +363,6 @@ protected:
|
|||||||
wxScopedPtr<wxFileSystemWatcher> m_watcher;
|
wxScopedPtr<wxFileSystemWatcher> m_watcher;
|
||||||
|
|
||||||
int m_eventTypes; // Which event-types to watch. Normally all of them
|
int m_eventTypes; // Which event-types to watch. Normally all of them
|
||||||
bool tested; // indicates, whether we have already passed the test
|
|
||||||
|
|
||||||
wxVector<wxFileSystemWatcherEvent*> m_events;
|
wxVector<wxFileSystemWatcherEvent*> m_events;
|
||||||
};
|
};
|
||||||
|
Reference in New Issue
Block a user