diff --git a/tests/controls/htmllboxtest.cpp b/tests/controls/htmllboxtest.cpp index 92707dd0a8..e9a675a971 100644 --- a/tests/controls/htmllboxtest.cpp +++ b/tests/controls/htmllboxtest.cpp @@ -8,6 +8,8 @@ #include "testprec.h" +#if wxUSE_HTML + #ifdef __BORLANDC__ #pragma hdrstop #endif @@ -56,3 +58,5 @@ void HtmlListBoxTestCase::tearDown() { wxDELETE(m_htmllbox); } + +#endif //wxUSE_HTML diff --git a/tests/controls/spinctrldbltest.cpp b/tests/controls/spinctrldbltest.cpp index 989891c9bd..13f72f383c 100644 --- a/tests/controls/spinctrldbltest.cpp +++ b/tests/controls/spinctrldbltest.cpp @@ -89,7 +89,7 @@ void SpinCtrlDoubleTestCase::NoEventsInCtor() void SpinCtrlDoubleTestCase::Arrows() { -#ifndef __WXGTK__ +#if wxUSE_UIACTIONSIMULATOR && !defined(__WXGTK__) EventCounter updated(m_spin, wxEVT_SPINCTRLDOUBLE); wxUIActionSimulator sim; diff --git a/tests/graphics/bitmap.cpp b/tests/graphics/bitmap.cpp index 6588a3a636..119de6cfaf 100644 --- a/tests/graphics/bitmap.cpp +++ b/tests/graphics/bitmap.cpp @@ -12,6 +12,8 @@ #include "testprec.h" +#ifdef wxHAS_RAW_BITMAP + #ifdef __BORLANDC__ #pragma hdrstop #endif @@ -153,3 +155,5 @@ void BitmapTestCase::OverlappingBlit() } } } + +#endif //wxHAS_RAW_BITMAP diff --git a/tests/html/htmlwindow.cpp b/tests/html/htmlwindow.cpp index 2bf6ba593d..959d99d9a0 100644 --- a/tests/html/htmlwindow.cpp +++ b/tests/html/htmlwindow.cpp @@ -104,10 +104,12 @@ static const char *TEST_PLAIN_TEXT = void HtmlWindowTestCase::SelectionToText() { +#if wxUSE_CLIPBOARD m_win->SetPage(TEST_MARKUP); m_win->SelectAll(); CPPUNIT_ASSERT_EQUAL( TEST_PLAIN_TEXT, m_win->SelectionToText() ); +#endif // wxUSE_CLIPBOARD } void HtmlWindowTestCase::Title() @@ -159,10 +161,12 @@ void HtmlWindowTestCase::LinkClick() void HtmlWindowTestCase::AppendToPage() { +#if wxUSE_CLIPBOARD m_win->SetPage(TEST_MARKUP_LINK); m_win->AppendToPage("A new paragraph"); CPPUNIT_ASSERT_EQUAL("link A new paragraph", m_win->ToText()); +#endif // wxUSE_CLIPBOARD } #endif //wxUSE_HTML diff --git a/tests/image/image.cpp b/tests/image/image.cpp index 3c4837d178..c0b19c7dcb 100644 --- a/tests/image/image.cpp +++ b/tests/image/image.cpp @@ -1250,6 +1250,7 @@ void ImageTestCase::GIFComment() // Test writing comments in an animated GIF and reading them back. CPPUNIT_ASSERT( image.LoadFile("horse.gif") ); +#if wxUSE_PALETTE wxImageArray images; int i; for (i = 0; i < 4; ++i) @@ -1287,6 +1288,7 @@ void ImageTestCase::GIFComment() image.GetOption(wxIMAGE_OPTION_GIF_COMMENT)); memIn.SeekI(pos); } +#endif //wxUSE_PALETTE } #endif // wxUSE_GIF diff --git a/tests/misc/guifuncs.cpp b/tests/misc/guifuncs.cpp index 535db58975..a47cafeb89 100644 --- a/tests/misc/guifuncs.cpp +++ b/tests/misc/guifuncs.cpp @@ -90,6 +90,7 @@ void MiscGUIFuncsTestCase::DisplaySize() void MiscGUIFuncsTestCase::URLDataObject() { +#if wxUSE_DATAOBJ // this tests for buffer overflow, see #11102 const char * const url = "http://something.long.to.overwrite.plenty.memory.example.com"; @@ -99,6 +100,7 @@ void MiscGUIFuncsTestCase::URLDataObject() wxClipboardLocker lockClip; CPPUNIT_ASSERT( wxTheClipboard->SetData(dobj) ); wxTheClipboard->Flush(); +#endif // wxUSE_DATAOBJ } void MiscGUIFuncsTestCase::ParseFileDialogFilter()