Do not use Tooltips if they are disabled

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

diff --git a/samples/propgrid/tests.cpp b/samples/propgrid/tests.cpp
index c4c7de94b3ef8599bd74b4319a4366bbad629da3..d12a7bb22acc49e3c6535c9f5ab3d44c84fef6f0 100644 (file)
--- a/samples/propgrid/tests.cpp
+++ b/samples/propgrid/tests.cpp
@@ -711,11 +711,11 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
             RT_FAILURE();
 
         // Make sure children of composite parent get updated as well
             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
 
         //
         // 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" )
         pgman->SetPropertyValue("Car", nvs);
 
         if ( pgman->GetPropertyValueAsString("Car.Model") != "Lamborghini Diablo XYZ" )


@@ -735,6 +735,12 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
             wxLogDebug("Did not match: Car.Price ($)=%s", pgman->GetPropertyValueAsString("Car.Price ($)").c_str());
             RT_FAILURE();
         }
             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 +1005,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();
 
         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;
         // Recreate the original grid
         CreateGrid( -1, -1 );
         pgman = m_pPropGridManager;