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

work around apparent VC6 bug resulting in warnings about using non-const wxSize/PointRefFromVariant versions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-06-07 12:38:39 +00:00
parent 6a8a90fe15
commit d21fc5bf4f
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
samples/propgrid/tests.cpp
View File

@@ -595,9 +595,11 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
col << pgman->GetPropertyValue(wxT("ColourProperty"));
if ( col != *wxBLACK )
RT_FAILURE();
if ( wxSizeRefFromVariant(pg->GetPropertyValue(wxT("Size"))) != wxSize(150,150) )
wxVariant varSize(pg->GetPropertyValue(wxT("Size")));
if ( wxSizeRefFromVariant(varSize) != wxSize(150,150) )
RT_FAILURE();
if ( wxPointRefFromVariant(pg->GetPropertyValue(wxT("Position"))) != wxPoint(150,150) )
wxVariant varPos(pg->GetPropertyValue(wxT("Position")));
if ( wxPointRefFromVariant(varPos) != wxPoint(150,150) )
RT_FAILURE();
if ( !(pg->GetPropertyValueAsArrayInt(wxT("MultiChoiceProperty")) == test_arrint_1) )
RT_FAILURE();
@@ -643,9 +645,11 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
col << pgman->GetPropertyValue(wxT("ColourProperty"));
if ( col != *wxWHITE )
RT_FAILURE();
if ( wxSizeRefFromVariant(pgman->GetPropertyValue(wxT("Size"))) != wxSize(300,300) )
varSize = pgman->GetPropertyValue(wxT("Size"));
if ( wxSizeRefFromVariant(varSize) != wxSize(300,300) )
RT_FAILURE();
if ( wxPointRefFromVariant(pgman->GetPropertyValue(wxT("Position"))) != wxPoint(300,300) )
varPos = pgman->GetPropertyValue(wxT("Position"));
if ( wxPointRefFromVariant(varPos) != wxPoint(300,300) )
RT_FAILURE();
if ( !(pgman->GetPropertyValueAsArrayInt(wxT("MultiChoiceProperty")) == test_arrint_2) )
RT_FAILURE();