Use template class instead of template function in wxVectorSort().

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

diff --git a/samples/propgrid/sampleprops.cpp b/samples/propgrid/sampleprops.cpp
index e7c29c9d190c491edda1afbc2daca9aebbcf0408..18b608fbc534a43f604614e902cabe2755ef9af3 100644 (file)
--- a/samples/propgrid/sampleprops.cpp
+++ b/samples/propgrid/sampleprops.cpp
@@ -161,7 +161,9 @@ void wxFontDataProperty::RefreshChildren()
     Item(6)->SetValue( variant );
 }
 
     Item(6)->SetValue( variant );
 }
 

-void wxFontDataProperty::ChildChanged( wxVariant& thisValue, int childIndex, wxVariant& childValue ) const
+wxVariant wxFontDataProperty::ChildChanged( wxVariant& thisValue,
+                                            int childIndex,
+                                            wxVariant& childValue ) const

 {
     wxFontData fontData;
     fontData << thisValue;
 {
     wxFontData fontData;
     fontData << thisValue;


@@ -183,7 +185,9 @@ void wxFontDataProperty::ChildChanged( wxVariant& thisValue, int childIndex, wxV
             fontData.SetChosenFont(font);
     }
 
             fontData.SetChosenFont(font);
     }
 

-    thisValue << fontData;
+    wxVariant newVariant;
+    newVariant << fontData;
+    return newVariant;

 }
 
 // -----------------------------------------------------------------------
 }
 
 // -----------------------------------------------------------------------


@@ -211,15 +215,20 @@ void wxSizeProperty::RefreshChildren()
     Item(1)->SetValue( (long)size.y );
 }
 
     Item(1)->SetValue( (long)size.y );
 }
 

-void wxSizeProperty::ChildChanged( wxVariant& thisValue, int childIndex, wxVariant& childValue ) const
+wxVariant wxSizeProperty::ChildChanged( wxVariant& thisValue,
+                                        int childIndex,
+                                        wxVariant& childValue ) const

 {
     wxSize& size = wxSizeRefFromVariant(thisValue);
 {
     wxSize& size = wxSizeRefFromVariant(thisValue);

-    int val = wxPGVariantToInt(childValue);
+    int val = childValue.GetLong();

     switch ( childIndex )
     {
         case 0: size.x = val; break;
         case 1: size.y = val; break;
     }
     switch ( childIndex )
     {
         case 0: size.x = val; break;
         case 1: size.y = val; break;
     }

+    wxVariant newVariant;
+    newVariant << size;
+    return newVariant;

 }
 
 // -----------------------------------------------------------------------
 }
 
 // -----------------------------------------------------------------------


@@ -247,15 +256,20 @@ void wxPointProperty::RefreshChildren()
     Item(1)->SetValue( (long)point.y );
 }
 
     Item(1)->SetValue( (long)point.y );
 }
 

-void wxPointProperty::ChildChanged( wxVariant& thisValue, int childIndex, wxVariant& childValue ) const
+wxVariant wxPointProperty::ChildChanged( wxVariant& thisValue,
+                                         int childIndex,
+                                         wxVariant& childValue ) const

 {
     wxPoint& point = wxPointRefFromVariant(thisValue);
 {
     wxPoint& point = wxPointRefFromVariant(thisValue);

-    int val = wxPGVariantToInt(childValue);
+    int val = childValue.GetLong();

     switch ( childIndex )
     {
         case 0: point.x = val; break;
         case 1: point.y = val; break;
     }
     switch ( childIndex )
     {
         case 0: point.x = val; break;
         case 1: point.y = val; break;
     }

+    wxVariant newVariant;
+    newVariant << point;
+    return newVariant;

 }
 
 
 }