some warnings fixed, checks for various wxUSE_XXX added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2390,6 +2390,10 @@ static void TestRegExInteractive()
|
|||||||
// database
|
// database
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
#if !wxUSE_ODBC
|
||||||
|
#undef TEST_ODBC
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef TEST_ODBC
|
#ifdef TEST_ODBC
|
||||||
|
|
||||||
#include <wx/db.h>
|
#include <wx/db.h>
|
||||||
@@ -3346,7 +3350,7 @@ static void TestVCardWrite()
|
|||||||
// wxVolume tests
|
// wxVolume tests
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
#if !wxUSE_FSVOLUME
|
#if !defined(__WIN32__) || !wxUSE_FSVOLUME
|
||||||
#undef TEST_VOLUME
|
#undef TEST_VOLUME
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -3831,7 +3835,7 @@ static void TestTimeTicks()
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
printf(" (ERROR: should be %ld, delta = %ld)\n",
|
printf(" (ERROR: should be %ld, delta = %ld)\n",
|
||||||
d.ticks, ticks - d.ticks);
|
(long)d.ticks, (long)(ticks - d.ticks));
|
||||||
}
|
}
|
||||||
|
|
||||||
dt = d.DT().ToTimezone(wxDateTime::GMT0);
|
dt = d.DT().ToTimezone(wxDateTime::GMT0);
|
||||||
@@ -3844,7 +3848,7 @@ static void TestTimeTicks()
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
printf(" (ERROR: should be %ld, delta = %ld)\n",
|
printf(" (ERROR: should be %ld, delta = %ld)\n",
|
||||||
d.gmticks, ticks - d.gmticks);
|
(long)d.gmticks, (long)(ticks - d.gmticks));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user