fix compilation due to the fact that wx/socket.h no longer includes system socket...

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

diff --git a/samples/propgrid/tests.cpp b/samples/propgrid/tests.cpp
index a237687684fb920378da7bc3c2608c6c81984acb..1c066ca0d9431561d16ba99af2e1a643fe02204c 100644 (file)
--- a/samples/propgrid/tests.cpp
+++ b/samples/propgrid/tests.cpp
@@ -31,85 +31,16 @@
 // wxTestCustomFlagsProperty
 // -----------------------------------------------------------------------
 
-//
-// Constant definitions required by wxFlagsProperty examples.
-//
-
-static const wxChar* _fs_framestyle_labels[] = {
-    wxT("wxCAPTION"),
-    wxT("wxMINIMIZE"),
-    wxT("wxMAXIMIZE"),
-    wxT("wxCLOSE_BOX"),
-    wxT("wxSTAY_ON_TOP"),
-    wxT("wxSYSTEM_MENU"),
-    wxT("wxRESIZE_BORDER"),
-    wxT("wxFRAME_TOOL_WINDOW"),
-    wxT("wxFRAME_NO_TASKBAR"),
-    wxT("wxFRAME_FLOAT_ON_PARENT"),
-    wxT("wxFRAME_SHAPED"),
-    (const wxChar*) NULL
-};
-
-static const long _fs_framestyle_values[] = {
-    wxCAPTION,
-    wxMINIMIZE,
-    wxMAXIMIZE,
-    wxCLOSE_BOX,
-    wxSTAY_ON_TOP,
-    wxSYSTEM_MENU,
-    wxRESIZE_BORDER,
-    wxFRAME_TOOL_WINDOW,
-    wxFRAME_NO_TASKBAR,
-    wxFRAME_FLOAT_ON_PARENT,
-    wxFRAME_SHAPED
-};
-
-// Colour labels. Last (before NULL, if any) must be Custom.
-static const wxChar* mycolprop_labels[] = {
-    wxT("Black"),
-    wxT("Blue"),
-    wxT("Brown"),
-    wxT("Custom"),
-    (const wxChar*) NULL
-};
-
-// Relevant colour values as unsigned longs.
-static unsigned long mycolprop_colours[] = {
-    wxPG_COLOUR(0,0,0),
-    wxPG_COLOUR(0,0,255),
-    wxPG_COLOUR(166,124,81),
-    wxPG_COLOUR(0,0,0)
-};
-
-// Implement property class. Third argument is optional values array,
-// but in this example we are only interested in creating a shortcut
-// for user to access the colour values. Last arg is itemcount, but
-// it will be deprecated in the future.
-WX_PG_DECLARE_CUSTOM_COLOUR_PROPERTY_USES_WXCOLOUR(wxMyColourProperty)
-WX_PG_IMPLEMENT_CUSTOM_COLOUR_PROPERTY_USES_WXCOLOUR(wxMyColourProperty,
-                                                     mycolprop_labels,
-                                                     (long*)NULL,
-                                                     mycolprop_colours)
-
-
-WX_PG_DECLARE_CUSTOM_COLOUR_PROPERTY(wxMyColour2Property)
-WX_PG_IMPLEMENT_CUSTOM_COLOUR_PROPERTY(wxMyColour2Property,
-                                       mycolprop_labels,
-                                       (long*)NULL,
-                                       mycolprop_colours)
-
-// -----------------------------------------------------------------------
-
 //
 // Test customizing wxColourProperty via subclassing
 //
 // * Includes custom colour entry.
 // * Includes extra custom entry.
 //
-class MyColourProperty3 : public wxColourProperty
+class MyColourProperty : public wxColourProperty
 {
 public:
-    MyColourProperty3( const wxString& label = wxPG_LABEL,
+    MyColourProperty( const wxString& label = wxPG_LABEL,
                        const wxString& name = wxPG_LABEL,
                        const wxColour& value = *wxWHITE )
         : wxColourProperty(label, name, value)
@@ -129,7 +60,7 @@ public:
         SetValue(variant);
     }
 
-    virtual ~MyColourProperty3()
+    virtual ~MyColourProperty()
     {
     }
 
@@ -174,26 +105,12 @@ public:
 
 void FormMain::AddTestProperties( wxPropertyGridPage* pg )
 {
-    pg->Append( new wxMyColourProperty(wxT("CustomColourProperty1")) );
-
-    pg->SetPropertyHelpString(wxT("CustomColourProperty1"),
-        wxT("This is a wxMyColourProperty from the sample app. ")
-        wxT("It is built with WX_PG_IMPLEMENT_CUSTOM_COLOUR_PROPERTY_USES_WXCOLOUR macro ")
-        wxT("and has wxColour as its data type"));
-
-    pg->Append( new wxMyColour2Property(wxT("CustomColourProperty2")) );
+    pg->Append( new MyColourProperty(wxT("CustomColourProperty"), wxPG_LABEL, *wxGREEN) );
+    pg->GetProperty(wxT("CustomColourProperty"))->SetFlag(wxPG_PROP_AUTO_UNSPECIFIED);
+    pg->SetPropertyEditor( wxT("CustomColourProperty"), wxPGEditor_ComboBox );
 
-    pg->SetPropertyHelpString(wxT("CustomColourProperty2"),
-        wxT("This is a wxMyColour2Property from the sample app. ")
-        wxT("It is built with WX_PG_IMPLEMENT_CUSTOM_COLOUR_PROPERTY macro ")
-        wxT("and has wxColourPropertyValue as its data type"));
-
-    pg->Append( new MyColourProperty3(wxT("CustomColourProperty3"), wxPG_LABEL, *wxGREEN) );
-    pg->GetProperty(wxT("CustomColourProperty3"))->SetFlag(wxPG_PROP_AUTO_UNSPECIFIED);
-    pg->SetPropertyEditor( wxT("CustomColourProperty3"), wxPGEditor_ComboBox );
-
-    pg->SetPropertyHelpString(wxT("CustomColourProperty3"),
-        wxT("This is a MyColourProperty3 from the sample app. ")
+    pg->SetPropertyHelpString(wxT("CustomColourProperty"),
+        wxT("This is a MyColourProperty from the sample app. ")
         wxT("It is built by subclassing wxColourProperty."));
 }
 
@@ -1001,6 +918,23 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
         pgman->EnsureVisible(wxT("Cell Colour"));
     }
 
+    {
+        RT_START_TEST(RemoveProperty)
+
+        wxPGProperty* p;
+
+        wxPGProperty* origParent =
+            pgman->GetProperty(wxT("Window Styles"))->GetParent();
+
+        p = pgman->RemoveProperty(wxT("Window Styles"));
+        pgman->Refresh();
+        pgman->Update();
+
+        pgman->AppendIn(origParent, p);
+        pgman->Refresh();
+        pgman->Update();
+    }
+
     {
         RT_START_TEST(SetPropertyBackgroundColour)
         wxCommandEvent evt;