Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use wxVector<> instead of macro-based wxArray

Browse Source 
Also remove the never used m_lastEvent member variable.

No real changes.
This commit is contained in:
Vadim Zeitlin
2019-04-25 02:46:32 +02:00
parent cd8bbcb8df
commit cfb194e55f
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/fswatcher/fswatchertest.cpp
View File

@@ -25,9 +25,10 @@
#include "wx/evtloop.h" #include "wx/evtloop.h"
#include "wx/filename.h" #include "wx/filename.h"
#include "wx/filefn.h" #include "wx/filefn.h"
#include "wx/fswatcher.h"
#include "wx/scopedptr.h" #include "wx/scopedptr.h"
#include "wx/stdpaths.h" #include "wx/stdpaths.h"
#include "wx/fswatcher.h" #include "wx/vector.h"
#include "testfile.h" #include "testfile.h"
@@ -339,8 +340,7 @@ public:
virtual void OnFileSystemEvent(wxFileSystemWatcherEvent& evt) virtual void OnFileSystemEvent(wxFileSystemWatcherEvent& evt)
{ {
wxLogDebug("--- %s ---", evt.ToString()); wxLogDebug("--- %s ---", evt.ToString());
m_lastEvent = wxDynamicCast(evt.Clone(), wxFileSystemWatcherEvent); m_events.push_back(wxDynamicCast(evt.Clone(), wxFileSystemWatcherEvent));
m_events.Add(m_lastEvent);
// test finished // test finished
SendIdle(); SendIdle();
@@ -415,10 +415,7 @@ protected:
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 bool tested; // indicates, whether we have already passed the test
#include "wx/arrimpl.cpp" wxVector<wxFileSystemWatcherEvent*> m_events;
WX_DEFINE_ARRAY_PTR(wxFileSystemWatcherEvent*, wxArrayEvent);
wxArrayEvent m_events;
wxFileSystemWatcherEvent* m_lastEvent;
}; };