X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7eac5c531c162c1acedbe1e74d6f7001269e00e5..c29c95fe24973b94fd724db767193171ca7c513d:/samples/propgrid/sampleprops.h diff --git a/samples/propgrid/sampleprops.h b/samples/propgrid/sampleprops.h index 28244dd7c5..0fbbf446b7 100644 --- a/samples/propgrid/sampleprops.h +++ b/samples/propgrid/sampleprops.h @@ -4,14 +4,15 @@ // Author: Jaakko Salli // Modified by: // Created: 2006-03-05 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) Jaakko Salli -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_SAMPLES_PROPGRID_SAMPLEPROPS_H_ #define _WX_SAMPLES_PROPGRID_SAMPLEPROPS_H_ +#include "wx/fontdata.h" DECLARE_VARIANT_OBJECT(wxFontData) @@ -28,14 +29,15 @@ public: void OnSetValue(); - // Inorder to have different value type in a derived property + // In order to have different value type in a derived property // class, we will override GetValue to return custom variant, // instead of changing the base m_value. This allows the methods // in base class to function properly. virtual wxVariant DoGetValue() const; - virtual void ChildChanged( wxVariant& thisValue, - int childIndex, wxVariant& childValue ) const; + virtual wxVariant ChildChanged( wxVariant& thisValue, + int childIndex, + wxVariant& childValue ) const; virtual void RefreshChildren(); virtual bool OnEvent( wxPropertyGrid* propgrid, wxWindow* primary, wxEvent& event ); @@ -56,8 +58,9 @@ public: const wxSize& value = wxSize() ); virtual ~wxSizeProperty(); - virtual void ChildChanged( wxVariant& thisValue, - int childIndex, wxVariant& childValue ) const; + virtual wxVariant ChildChanged( wxVariant& thisValue, + int childIndex, + wxVariant& childValue ) const; virtual void RefreshChildren(); protected: @@ -80,8 +83,9 @@ public: const wxPoint& value = wxPoint() ); virtual ~wxPointProperty(); - virtual void ChildChanged( wxVariant& thisValue, - int childIndex, wxVariant& childValue ) const; + virtual wxVariant ChildChanged( wxVariant& thisValue, + int childIndex, + wxVariant& childValue ) const; virtual void RefreshChildren(); protected: @@ -113,7 +117,7 @@ public: virtual ~wxArrayDoubleProperty (); virtual void OnSetValue(); - virtual wxString GetValueAsString( int argFlags = 0 ) const; + virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const; virtual bool StringToValue( wxVariant& variant, const wxString& text, int argFlags = 0 ) const;