Allow setting long version field in About dialog.

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

diff --git a/samples/propgrid/tests.cpp b/samples/propgrid/tests.cpp
index 7a8cc656f34b0b8d32e608d013f229972d07ac48..a6b700dbf60280e4d87ac5f5f1ad12eccfbaee8a 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();
@@ -658,58 +662,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"
 
@@ -1005,12 +957,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;