AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix event propagation test build for !wxUSE_DOC_VIEW_ARCHITECTURE

Browse Source 
Avoid compiling the test using wxDocument etc when they're not
available.

Closes #18700.
This commit is contained in:
Vadim Zeitlin 2020-03-19 01:16:52 +01:00
parent 9b36924258
commit 335565076e
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/events/propagation.cpp
View File

@ -251,7 +251,9 @@ private:
#if !defined (__WXX11__) #if !defined (__WXX11__)
CPPUNIT_TEST( MenuEvent ); CPPUNIT_TEST( MenuEvent );
#endif #endif
#if wxUSE_DOC_VIEW_ARCHITECTURE
CPPUNIT_TEST( DocView ); CPPUNIT_TEST( DocView );
#endif // wxUSE_DOC_VIEW_ARCHITECTURE
WXUISIM_TEST( ContextMenuEvent ); WXUISIM_TEST( ContextMenuEvent );
WXUISIM_TEST( PropagationLevel ); WXUISIM_TEST( PropagationLevel );
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
@ -264,7 +266,9 @@ private:
void ScrollWindowWithoutHandler(); void ScrollWindowWithoutHandler();
void ScrollWindowWithHandler(); void ScrollWindowWithHandler();
void MenuEvent(); void MenuEvent();
#if wxUSE_DOC_VIEW_ARCHITECTURE
void DocView(); void DocView();
#endif // wxUSE_DOC_VIEW_ARCHITECTURE
#if wxUSE_UIACTIONSIMULATOR #if wxUSE_UIACTIONSIMULATOR
void ContextMenuEvent(); void ContextMenuEvent();
void PropagationLevel(); void PropagationLevel();
@ -502,6 +506,8 @@ void EventPropagationTestCase::MenuEvent()
ASSERT_MENU_EVENT_RESULT( menu, "aomobowA" ); ASSERT_MENU_EVENT_RESULT( menu, "aomobowA" );
} }
#if wxUSE_DOC_VIEW_ARCHITECTURE
// Minimal viable implementations of wxDocument and wxView. // Minimal viable implementations of wxDocument and wxView.
class EventTestDocument : public wxDocument class EventTestDocument : public wxDocument
{ {
@ -613,6 +619,8 @@ void EventPropagationTestCase::DocView()
#endif // wxUSE_TOOLBAR #endif // wxUSE_TOOLBAR
} }
#endif // wxUSE_DOC_VIEW_ARCHITECTURE
#if wxUSE_UIACTIONSIMULATOR #if wxUSE_UIACTIONSIMULATOR
class ContextMenuTestWindow : public wxWindow class ContextMenuTestWindow : public wxWindow