implement images support for wxButton under XP and later

[wxWidgets.git] / samples / propgrid / tests.cpp

diff --git a/samples/propgrid/tests.cpp b/samples/propgrid/tests.cpp
index d12a7bb22acc49e3c6535c9f5ab3d44c84fef6f0..6bdcdf51591f9738fce5ee6e97b5ce8430c5c5c9 100644 (file)
--- a/samples/propgrid/tests.cpp
+++ b/samples/propgrid/tests.cpp
@@ -595,9 +595,11 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
         col << pgman->GetPropertyValue(wxT("ColourProperty"));
         if ( col != *wxBLACK )
             RT_FAILURE();
         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();
             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();
             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();
         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();
             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();
             RT_FAILURE();
         if ( !(pgman->GetPropertyValueAsArrayInt(wxT("MultiChoiceProperty")) == test_arrint_2) )
             RT_FAILURE();