X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d21fc5bf4f41ebbe8c794611cf03242a837d6100..d8eff331e23435d9d8d6483a40f6fd9997a13f87:/samples/propgrid/tests.cpp?ds=sidebyside

diff --git a/samples/propgrid/tests.cpp b/samples/propgrid/tests.cpp
index 6bdcdf5159..ebd8e88c00 100644
--- a/samples/propgrid/tests.cpp
+++ b/samples/propgrid/tests.cpp
@@ -162,8 +162,9 @@ void FormMain::OnDumpList( wxCommandEvent& WXUNUSED(event) )
     const int spacing = 8;
     wxBoxSizer* topsizer = new wxBoxSizer( wxVERTICAL );
     wxBoxSizer* rowsizer = new wxBoxSizer( wxHORIZONTAL );
-    wxTextCtrl* ed = new wxTextCtrl(dlg,11,text,
-        wxDefaultPosition,wxDefaultSize,wxTE_MULTILINE|wxTE_READONLY);
+    wxTextCtrl* ed = new wxTextCtrl(dlg, 11, text,
+                                    wxDefaultPosition, wxDefaultSize,
+                                    wxTE_MULTILINE);
     rowsizer->Add( ed, 1, wxEXPAND|wxALL, spacing );
     topsizer->Add( rowsizer, 1, wxEXPAND, 0 );
     rowsizer = new wxBoxSizer( wxHORIZONTAL );
@@ -249,6 +250,10 @@ protected:
         failures++; \
     }
 
+#define RT_ASSERT(COND) \
+    if (!(COND)) \
+        RT_FAILURE()
+
 #define RT_FAILURE_MSG(MSG) \
     { \
         wxString s1 = wxString::Format(wxT("Test failure in tests.cpp, line %i."),__LINE__-1); \
@@ -338,8 +343,9 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
     const int spacing = 8;
     wxBoxSizer* topsizer = new wxBoxSizer( wxVERTICAL );
     wxBoxSizer* rowsizer = new wxBoxSizer( wxHORIZONTAL );
-    wxTextCtrl* ed = new wxTextCtrl(dlg,11,wxEmptyString,
-        wxDefaultPosition,wxDefaultSize,wxTE_MULTILINE|wxTE_READONLY);
+    wxTextCtrl* ed = new wxTextCtrl(dlg, 11, wxEmptyString,
+                                    wxDefaultPosition, wxDefaultSize,
+                                    wxTE_MULTILINE);
     rowsizer->Add( ed, 1, wxEXPAND|wxALL, spacing );
     topsizer->Add( rowsizer, 1, wxEXPAND, 0 );
     rowsizer = new wxBoxSizer( wxHORIZONTAL );
@@ -662,58 +668,6 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
         if ( pgman->GetPropertyValueAsLongLong(wxT("IntProperty")) != wxLL(-80000000000) )
             RT_FAILURE();
 
-        //
-        // Flexible wx(U)LongLong << operator safety conformance tests
-        wxPGProperty* prop;
-        wxLongLong ll;
-        wxULongLong ull;
-
-        prop = pgman->GetProperty(wxT("IntProperty"));
-        prop->SetValue(128);
-        ll << prop->GetValue();
-        if ( ll != 128 )
-            RT_FAILURE();
-
-        prop->SetValue(WXVARIANT(wxLL(68719476736)));
-        ll << prop->GetValue();
-        if ( ll.GetValue() != wxLL(68719476736) )
-            RT_FAILURE();
-
-#if wxUSE_LONGLONG_NATIVE
-        wxLongLong_t ll_t;
-        ll_t << prop->GetValue();
-        if ( ll_t != wxLL(68719476736) )
-            RT_FAILURE();
-#endif
-
-        prop->SetValue(256);
-        ll << prop->GetValue();
-        if ( ll != 256 )
-            RT_FAILURE();
-
-        prop = pgman->GetProperty(wxT("UIntProperty"));
-        prop->SetValue(128);
-        ull << prop->GetValue();
-        if ( ull != 128 )
-            RT_FAILURE();
-
-        prop->SetValue(WXVARIANT(wxULL(68719476739)));
-        ull << prop->GetValue();
-        if ( ull.GetValue() != wxULL(68719476739) )
-            RT_FAILURE();
-
-#if wxUSE_LONGLONG_NATIVE
-        wxULongLong_t ull_t;
-        ull_t << prop->GetValue();
-        if ( ull_t != wxLL(68719476739) )
-            RT_FAILURE();
-#endif
-
-        prop->SetValue(256);
-        ull << prop->GetValue();
-        if ( ull != 256 )
-            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; Not Convertible"
 
@@ -766,6 +720,86 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
 #endif
     }
 
+    {
+        //
+        // Test multiple selection
+        RT_START_TEST(MULTIPLE_SELECTION)
+        if ( !(pgman->GetExtraStyle() & wxPG_EX_MULTIPLE_SELECTION) )
+            CreateGrid( -1, wxPG_EX_MULTIPLE_SELECTION);
+        pgman = m_pPropGridManager;
+
+        wxPropertyGrid* pg = pgman->GetGrid();
+
+        wxPGProperty* prop1 = pg->GetProperty(wxT("Label"));
+        wxPGProperty* prop2 = pg->GetProperty(wxT("Cell Text Colour"));
+        wxPGProperty* prop3 = pg->GetProperty(wxT("Height"));
+        wxPGProperty* catProp = pg->GetProperty(wxT("Appearance"));
+
+        RT_ASSERT( prop1 && prop2 && prop3 );
+
+        pg->ClearSelection();
+        pg->AddToSelection(prop1);
+        pg->AddToSelection(prop2);
+        pg->AddToSelection(prop3);
+
+        // Adding category to selection should fail silently
+        pg->AddToSelection(catProp);
+
+        wxArrayPGProperty selectedProperties = pg->GetSelectedProperties();
+
+        RT_ASSERT( selectedProperties.size() == 3 )
+        RT_ASSERT( pg->IsPropertySelected(prop1) )
+        RT_ASSERT( pg->IsPropertySelected(prop2) )
+        RT_ASSERT( pg->IsPropertySelected(prop3) )
+        RT_ASSERT( !pg->IsPropertySelected(catProp) )
+
+        pg->RemoveFromSelection(prop1);
+        wxArrayPGProperty selectedProperties2 = pg->GetSelectedProperties();
+
+        RT_ASSERT( selectedProperties2.size() == 2 )
+        RT_ASSERT( !pg->IsPropertySelected(prop1) )
+        RT_ASSERT( pg->IsPropertySelected(prop2) )
+        RT_ASSERT( pg->IsPropertySelected(prop3) )
+
+        pg->ClearSelection();
+
+        wxArrayPGProperty selectedProperties3 = pg->GetSelectedProperties();
+
+        RT_ASSERT( selectedProperties3.size() == 0 )
+        RT_ASSERT( !pg->IsPropertySelected(prop1) )
+        RT_ASSERT( !pg->IsPropertySelected(prop2) )
+        RT_ASSERT( !pg->IsPropertySelected(prop3) )
+
+        pg->SelectProperty(prop2);
+
+        RT_ASSERT( !pg->IsPropertySelected(prop1) )
+        RT_ASSERT( pg->IsPropertySelected(prop2) )
+        RT_ASSERT( !pg->IsPropertySelected(prop3) )
+    }
+
+    {
+        //
+        // Test label editing
+        RT_START_TEST(LABEL_EDITING)
+
+        wxPropertyGrid* pg = pgman->GetGrid();
+
+        // Just mostly test that these won't crash
+        pg->MakeColumnEditable(0, true);
+        pg->MakeColumnEditable(2, true);
+        pg->MakeColumnEditable(0, false);
+        pg->MakeColumnEditable(2, false);
+        pg->SelectProperty(wxT("Height"));
+        pg->BeginLabelEdit(0);
+        pg->BeginLabelEdit(0);
+        pg->EndLabelEdit(0);
+        pg->EndLabelEdit(0);
+
+        // Recreate grid
+        CreateGrid( -1, -1 );
+        pgman = m_pPropGridManager;
+    }
+
     {
         RT_START_TEST(Attributes)
 
@@ -1037,8 +1071,7 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
         pgman = m_pPropGridManager;
     }
 
-    /*
-    {
+    /*{
         // TODO: This test fails.
         RT_START_TEST(SetSplitterPosition)
 
@@ -1075,8 +1108,7 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
         // Recreate the original grid
         CreateGrid( -1, -1 );
         pgman = m_pPropGridManager;
-    }
-    */
+    }*/
 
     {
         RT_START_TEST(HideProperty)
@@ -1086,7 +1118,7 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
         srand(0x1234);
 
         wxArrayPGProperty arr1;
-        
+
         arr1 = GetPropertiesInRandomOrder(page);
 
         if ( !_failed_ )
@@ -1230,7 +1262,7 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
 
         wxASSERT(wxPG_EX_INIT_NOCAT == 0x00001000);
 
-        for ( i=12; i<24; i++ )
+        for ( i=12; i<27; i++ )
         {
             int flag = 1<<i;
             RT_MSG(wxString::Format(wxT("ExStyle: 0x%X"),flag));