Add simple wxListCtrl to complex sample

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

diff --git a/samples/propgrid/tests.cpp b/samples/propgrid/tests.cpp
index 1c066ca0d9431561d16ba99af2e1a643fe02204c..7a8cc656f34b0b8d32e608d013f229972d07ac48 100644 (file)
--- a/samples/propgrid/tests.cpp
+++ b/samples/propgrid/tests.cpp
@@ -306,6 +306,15 @@ wxArrayPGProperty GetPropertiesInRandomOrder( wxPropertyGridInterface* props, in
     return arr;
 }
 
     return arr;
 }
 

+// Callback for testing property sorting
+int MyPropertySortFunction(wxPropertyGrid* WXUNUSED(propGrid),
+                           wxPGProperty* p1,
+                           wxPGProperty* p2)
+{
+    // Reverse alphabetical order
+    return p2->GetLabel().CmpNoCase( p1->GetBaseName() );
+}
+

 bool FormMain::RunTests( bool fullTest, bool interactive )
 {
     wxString t;
 bool FormMain::RunTests( bool fullTest, bool interactive )
 {
     wxString t;


@@ -702,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" )


@@ -726,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();
+        }

     }
 
     {
     }
 
     {


@@ -935,6 +950,51 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
         pgman->Update();
     }
 
         pgman->Update();
     }
 

+    {
+        RT_START_TEST(SortFunction)
+
+        wxPGProperty* p;
+
+        // Make sure indexes are as supposed
+
+        p = pgman->GetProperty(wxT("User Name"));
+        if ( p->GetIndexInParent() != 3 )
+            RT_FAILURE();
+
+        p = pgman->GetProperty(wxT("User Id"));
+        if ( p->GetIndexInParent() != 2 )
+            RT_FAILURE();
+
+        p = pgman->GetProperty(wxT("User Home"));
+        if ( p->GetIndexInParent() != 1 )
+            RT_FAILURE();
+
+        p = pgman->GetProperty(wxT("Operating System"));
+        if ( p->GetIndexInParent() != 0 )
+            RT_FAILURE();
+
+        pgman->GetGrid()->SetSortFunction(MyPropertySortFunction);
+
+        pgman->GetGrid()->SortChildren(wxT("Environment"));
+
+        // Make sure indexes have been reversed
+        p = pgman->GetProperty(wxT("User Name"));
+        if ( p->GetIndexInParent() != 0 )
+            RT_FAILURE();
+
+        p = pgman->GetProperty(wxT("User Id"));
+        if ( p->GetIndexInParent() != 1 )
+            RT_FAILURE();
+
+        p = pgman->GetProperty(wxT("User Home"));
+        if ( p->GetIndexInParent() != 2 )
+            RT_FAILURE();
+
+        p = pgman->GetProperty(wxT("Operating System"));
+        if ( p->GetIndexInParent() != 3 )
+            RT_FAILURE();
+    }
+

     {
         RT_START_TEST(SetPropertyBackgroundColour)
         wxCommandEvent evt;
     {
         RT_START_TEST(SetPropertyBackgroundColour)
         wxCommandEvent evt;