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

Fix building tests with wxUSE_UIACTIONSIMULATOR==0

Browse Source
This commit is contained in:
Paul Cornett
2017-10-01 09:44:53 -07:00
parent fc7f20c419
commit a87599b127
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/controls/bitmapcomboboxtest.cpp
View File

@@ -59,8 +59,8 @@ private:
void Bitmap(); void Bitmap();
#ifdef __WXGTK__ #if defined(__WXGTK__) && wxUSE_UIACTIONSIMULATOR
virtual void SimSelect() virtual void SimSelect() wxOVERRIDE
{ {
// There is an inexplicable and locally irreproducible failure in this // There is an inexplicable and locally irreproducible failure in this
// test for wxBitmapComboBox when it runs on the Linux buildbot slaves: // test for wxBitmapComboBox when it runs on the Linux buildbot slaves:

2
tests/controls/itemcontainertest.h
View File

@@ -52,7 +52,9 @@ protected:
void Set(); void Set();
void SetSelection(); void SetSelection();
void SetString(); void SetString();
#if wxUSE_UIACTIONSIMULATOR
virtual void SimSelect(); virtual void SimSelect();
#endif
private: private:
wxDECLARE_NO_COPY_CLASS(ItemContainerTestCase); wxDECLARE_NO_COPY_CLASS(ItemContainerTestCase);

4
tests/events/propagation.cpp
View File

@@ -248,7 +248,7 @@ private:
#endif #endif
CPPUNIT_TEST( DocView ); CPPUNIT_TEST( DocView );
WXUISIM_TEST( ContextMenuEvent ); WXUISIM_TEST( ContextMenuEvent );
CPPUNIT_TEST( PropagationLevel ); WXUISIM_TEST( PropagationLevel );
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
void OneHandler(); void OneHandler();
@@ -260,8 +260,10 @@ private:
void ScrollWindowWithHandler(); void ScrollWindowWithHandler();
void MenuEvent(); void MenuEvent();
void DocView(); void DocView();
#if wxUSE_UIACTIONSIMULATOR
void ContextMenuEvent(); void ContextMenuEvent();
void PropagationLevel(); void PropagationLevel();
#endif
wxDECLARE_NO_COPY_CLASS(EventPropagationTestCase); wxDECLARE_NO_COPY_CLASS(EventPropagationTestCase);
}; };