diff --git a/samples/propgrid/propgrid.cpp b/samples/propgrid/propgrid.cpp
index 78a09597cd..ceacdfaf40 100644
--- a/samples/propgrid/propgrid.cpp
+++ b/samples/propgrid/propgrid.cpp
@@ -207,8 +207,7 @@ private:
 
 WX_PG_IMPLEMENT_VARIANT_DATA_DUMMY_EQ(wxVector3f)
 
-WX_PG_IMPLEMENT_PROPERTY_CLASS(wxVectorProperty,wxPGProperty,
-                               wxVector3f,const wxVector3f&,TextCtrl)
+wxPG_IMPLEMENT_PROPERTY_CLASS(wxVectorProperty,wxPGProperty,TextCtrl)
 
 
 wxVectorProperty::wxVectorProperty( const wxString& label,
@@ -259,8 +258,7 @@ wxVariant wxVectorProperty::ChildChanged( wxVariant& thisValue,
 
 WX_PG_IMPLEMENT_VARIANT_DATA_DUMMY_EQ(wxTriangle)
 
-WX_PG_IMPLEMENT_PROPERTY_CLASS(wxTriangleProperty,wxPGProperty,
-                               wxTriangle,const wxTriangle&,TextCtrl)
+wxPG_IMPLEMENT_PROPERTY_CLASS(wxTriangleProperty,wxPGProperty,TextCtrl)
 
 
 wxTriangleProperty::wxTriangleProperty( const wxString& label,
diff --git a/samples/propgrid/sampleprops.cpp b/samples/propgrid/sampleprops.cpp
index e88785eb45..d6ed678987 100644
--- a/samples/propgrid/sampleprops.cpp
+++ b/samples/propgrid/sampleprops.cpp
@@ -50,8 +50,7 @@ bool operator == (const wxFontData&, const wxFontData&)
 
 IMPLEMENT_VARIANT_OBJECT_SHALLOWCMP(wxFontData)
 
-WX_PG_IMPLEMENT_PROPERTY_CLASS(wxFontDataProperty,wxFontProperty,
-                               wxFontData,const wxFontData&,TextCtrlAndButton)
+wxPG_IMPLEMENT_PROPERTY_CLASS(wxFontDataProperty,wxFontProperty,TextCtrlAndButton)
 
 wxFontDataProperty::wxFontDataProperty( const wxString& label, const wxString& name,
    const wxFontData& value ) : wxFontProperty(label,name,value.GetInitialFont())
@@ -196,8 +195,7 @@ wxVariant wxFontDataProperty::ChildChanged( wxVariant& thisValue,
 // wxSizeProperty
 // -----------------------------------------------------------------------
 
-WX_PG_IMPLEMENT_PROPERTY_CLASS(wxSizeProperty,wxPGProperty,
-                               wxSize,const wxSize&,TextCtrl)
+wxPG_IMPLEMENT_PROPERTY_CLASS(wxSizeProperty,wxPGProperty,TextCtrl)
 
 wxSizeProperty::wxSizeProperty( const wxString& label, const wxString& name,
     const wxSize& value) : wxPGProperty(label,name)
@@ -237,8 +235,7 @@ wxVariant wxSizeProperty::ChildChanged( wxVariant& thisValue,
 // wxPointProperty
 // -----------------------------------------------------------------------
 
-WX_PG_IMPLEMENT_PROPERTY_CLASS(wxPointProperty,wxPGProperty,
-                               wxPoint,const wxPoint&,TextCtrl)
+wxPG_IMPLEMENT_PROPERTY_CLASS(wxPointProperty,wxPGProperty,TextCtrl)
 
 wxPointProperty::wxPointProperty( const wxString& label, const wxString& name,
     const wxPoint& value) : wxPGProperty(label,name)
@@ -489,11 +486,9 @@ bool operator == (const wxArrayDouble& a, const wxArrayDouble& b)
 
 WX_PG_IMPLEMENT_VARIANT_DATA_DUMMY_EQ(wxArrayDouble)
 
-WX_PG_IMPLEMENT_PROPERTY_CLASS(wxArrayDoubleProperty,
-                               wxPGProperty,
-                               wxArrayDouble,
-                               const wxArrayDouble&,
-                               TextCtrlAndButton)
+wxPG_IMPLEMENT_PROPERTY_CLASS(wxArrayDoubleProperty,
+                              wxPGProperty,
+                              TextCtrlAndButton)
 
 
 wxArrayDoubleProperty::wxArrayDoubleProperty (const wxString& label,