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

Adapted wxPropertyGrid documentation, samples, tests, and wxVariantData-macros to the new wxAny<->wxVariant conversions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2010-04-16 14:36:32 +00:00
parent 0bf14ab8b1
commit 4e0bdd562d
4 changed files with 122 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
samples/propgrid/tests.cpp
View File

@@ -501,6 +501,59 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
pgman = m_pPropGridManager;
}
{
//
// Test wxAny<->wxVariant conversion
RT_START_TEST(WXVARIANT_TO_WXANY_CONVERSION)
wxPGProperty* prop;
wxAny any;
#if wxUSE_DATETIME
prop = pgman->GetProperty("DateProperty");
wxDateTime testTime = wxDateTime::Now();
any = testTime;
prop->SetValue(any);
if ( prop->GetValue().GetAny().As<wxDateTime>() != testTime )
RT_FAILURE();
#endif
prop = pgman->GetProperty("IntProperty");
int testInt = 25537983;
any = testInt;
prop->SetValue(any);
if ( prop->GetValue().GetAny().As<int>() != testInt )
RT_FAILURE();
#ifdef wxLongLong_t
if ( prop->GetValue().GetAny().As<wxLongLong_t>() != testInt )
RT_FAILURE();
#endif
prop = pgman->GetProperty("StringProperty");
wxString testString = "asd934jfyn3";
any = testString;
prop->SetValue(any);
if ( prop->GetValue().GetAny().As<wxString>() != testString )
RT_FAILURE();
// Test with a type generated with IMPLEMENT_VARIANT_OBJECT()
prop = pgman->GetProperty("ColourProperty");
wxColour testCol = *wxCYAN;
any = testCol;
prop->SetValue(any);
if ( prop->GetValue().GetAny().As<wxColour>() != testCol )
RT_FAILURE();
// Test with a type with custom wxVariantData defined by
// wxPG headers.
prop = pgman->GetProperty("Position");
wxPoint testPoint(199, 199);
any = testPoint;
prop->SetValue(any);
if ( prop->GetValue().GetAny().As<wxPoint>() != testPoint )
RT_FAILURE();
}
{
RT_START_TEST(GetPropertyValues)