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 c4c7de94b3ef8599bd74b4319a4366bbad629da3..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();
-        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();
@@ -711,11 +715,11 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
             RT_FAILURE();
 
         // Make sure children of composite parent get updated as well
-        // Original string value: "Lamborghini Diablo SV; 5707; [300; 3.9; 8.6] 300000"
+        // Original string value: "Lamborghini Diablo SV; 5707; [300; 3.9; 8.6] 300000; Not Convertible"
 
         //
         // This updates children as well
-        wxString nvs = "Lamborghini Diablo XYZ; 5707; [100; 3.9; 8.6] 3000002";
+        wxString nvs = "Lamborghini Diablo XYZ; 5707; [100; 3.9; 8.6] 3000002; Convertible";
         pgman->SetPropertyValue("Car", nvs);
 
         if ( pgman->GetPropertyValueAsString("Car.Model") != "Lamborghini Diablo XYZ" )
@@ -735,6 +739,12 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
             wxLogDebug("Did not match: Car.Price ($)=%s", pgman->GetPropertyValueAsString("Car.Price ($)").c_str());
             RT_FAILURE();
         }
+
+        if ( !pgman->GetPropertyValueAsBool("Car.Convertible") )
+        {
+            wxLogDebug("Did not match: Car.Convertible=%s", pgman->GetPropertyValueAsString("Car.Convertible").c_str());
+            RT_FAILURE();
+        }
     }
 
     {
@@ -999,12 +1009,29 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
     }
 
     {
-        RT_START_TEST(ManagerClear)
+        RT_START_TEST(Clear)
+
+        // Manager clear
+        pgman->SelectProperty("Label");
         pgman->Clear();
 
         if ( pgman->GetPageCount() )
             RT_FAILURE();
 
+        if ( pgman->GetGrid()->GetRoot()->GetChildCount() )
+            RT_FAILURE();
+
+        // Recreate the original grid
+        CreateGrid( -1, -1 );
+        pgman = m_pPropGridManager;
+
+        // Grid clear
+        pgman->SelectProperty("Label");
+        pgman->GetGrid()->Clear();
+
+        if ( pgman->GetGrid()->GetRoot()->GetChildCount() )
+            RT_FAILURE();
+
         // Recreate the original grid
         CreateGrid( -1, -1 );
         pgman = m_pPropGridManager;