Use wx-prefixed macros throughout the repository.
Change {DECLARE,IMPLEMENT}_*CLASS and {DECLARE,BEGIN,END}_EVENT_TABLE occurrences to use the wx-prefixed version of the macros.
This commit is contained in:
@@ -36,7 +36,7 @@ private:
|
||||
|
||||
void CheckAll();
|
||||
|
||||
DECLARE_NO_COPY_CLASS(EventCloneTestCase)
|
||||
wxDECLARE_NO_COPY_CLASS(EventCloneTestCase);
|
||||
};
|
||||
|
||||
// register in the unnamed registry so that these tests are run by default
|
||||
|
@@ -124,10 +124,10 @@ public:
|
||||
void OnIdle(wxIdleEvent&) { g_called.method = true; }
|
||||
|
||||
private:
|
||||
DECLARE_EVENT_TABLE()
|
||||
wxDECLARE_EVENT_TABLE();
|
||||
};
|
||||
|
||||
BEGIN_EVENT_TABLE(MyClassWithEventTable, wxEvtHandler)
|
||||
wxBEGIN_EVENT_TABLE(MyClassWithEventTable, wxEvtHandler)
|
||||
EVT_IDLE(MyClassWithEventTable::OnIdle)
|
||||
|
||||
EVT_MYEVENT(MyClassWithEventTable::OnMyEvent)
|
||||
@@ -136,7 +136,7 @@ BEGIN_EVENT_TABLE(MyClassWithEventTable, wxEvtHandler)
|
||||
// this shouldn't compile:
|
||||
//EVT_MYEVENT(MyClassWithEventTable::OnIdle)
|
||||
//EVT_IDLE(MyClassWithEventTable::OnAnotherEvent)
|
||||
END_EVENT_TABLE()
|
||||
wxEND_EVENT_TABLE()
|
||||
|
||||
} // anonymous namespace
|
||||
|
||||
@@ -185,7 +185,7 @@ private:
|
||||
MyHandler handler;
|
||||
MyEvent e;
|
||||
|
||||
DECLARE_NO_COPY_CLASS(EvtHandlerTestCase)
|
||||
wxDECLARE_NO_COPY_CLASS(EvtHandlerTestCase);
|
||||
};
|
||||
|
||||
// register in the unnamed registry so that these tests are run by default
|
||||
|
@@ -42,7 +42,7 @@ private:
|
||||
|
||||
void TestExit();
|
||||
|
||||
DECLARE_NO_COPY_CLASS(EvtloopTestCase)
|
||||
wxDECLARE_NO_COPY_CLASS(EvtloopTestCase);
|
||||
};
|
||||
|
||||
// register in the unnamed registry so that these tests are run by default
|
||||
|
@@ -153,7 +153,7 @@ private:
|
||||
|
||||
const char m_tag;
|
||||
|
||||
DECLARE_NO_COPY_CLASS(TestWindow)
|
||||
wxDECLARE_NO_COPY_CLASS(TestWindow);
|
||||
};
|
||||
|
||||
// a scroll window handling paint event: we want to have a special test case
|
||||
@@ -261,7 +261,7 @@ private:
|
||||
void DocView();
|
||||
void ContextMenuEvent();
|
||||
|
||||
DECLARE_NO_COPY_CLASS(EventPropagationTestCase)
|
||||
wxDECLARE_NO_COPY_CLASS(EventPropagationTestCase);
|
||||
};
|
||||
|
||||
// register in the unnamed registry so that these tests are run by default
|
||||
|
@@ -53,7 +53,7 @@ private:
|
||||
void BackwardsClockBug();
|
||||
void RestartBug();
|
||||
|
||||
DECLARE_NO_COPY_CLASS(StopWatchTestCase)
|
||||
wxDECLARE_NO_COPY_CLASS(StopWatchTestCase);
|
||||
};
|
||||
|
||||
// register in the unnamed registry so that these tests are run by default
|
||||
|
@@ -52,7 +52,7 @@ private:
|
||||
|
||||
int m_events;
|
||||
|
||||
DECLARE_NO_COPY_CLASS(TimerCounterHandler)
|
||||
wxDECLARE_NO_COPY_CLASS(TimerCounterHandler);
|
||||
};
|
||||
|
||||
// --------------------------------------------------------------------------
|
||||
@@ -73,7 +73,7 @@ private:
|
||||
void OneShot();
|
||||
void Multiple();
|
||||
|
||||
DECLARE_NO_COPY_CLASS(TimerEventTestCase)
|
||||
wxDECLARE_NO_COPY_CLASS(TimerEventTestCase);
|
||||
};
|
||||
|
||||
// register in the unnamed registry so that these tests are run by default
|
||||
@@ -98,7 +98,7 @@ void TimerEventTestCase::OneShot()
|
||||
|
||||
wxEventLoopBase& m_loop;
|
||||
|
||||
// don't use DECLARE_NO_COPY_CLASS() to avoid upsetting MSVC
|
||||
// don't use wxDECLARE_NO_COPY_CLASS() to avoid upsetting MSVC
|
||||
};
|
||||
|
||||
wxEventLoop loop;
|
||||
|
Reference in New Issue
Block a user