X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/524d97b1c22daf69c57ca92c55ef4bbb206a0943..48889bca6f8b2504f78c0f47b32f5e95c64d915d:/samples/propgrid/propgrid.h?ds=sidebyside diff --git a/samples/propgrid/propgrid.h b/samples/propgrid/propgrid.h index df754a2055..54c5f15ee3 100644 --- a/samples/propgrid/propgrid.h +++ b/samples/propgrid/propgrid.h @@ -4,7 +4,7 @@ // Author: Jaakko Salli // Modified by: // Created: 2004-09-25 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) Jaakko Salli // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// @@ -72,12 +72,13 @@ class wxVectorProperty : public wxPGProperty public: wxVectorProperty( const wxString& label = wxPG_LABEL, - const wxString& name = wxPG_LABEL, - const wxVector3f& value = wxVector3f() ); + const wxString& name = wxPG_LABEL, + const wxVector3f& value = wxVector3f() ); virtual ~wxVectorProperty(); - virtual void ChildChanged( wxVariant& thisValue, - int childIndex, wxVariant& childValue ) const; + virtual wxVariant ChildChanged( wxVariant& thisValue, + int childIndex, + wxVariant& childValue ) const; virtual void RefreshChildren(); protected: @@ -108,8 +109,9 @@ public: const wxTriangle& value = wxTriangle() ); virtual ~wxTriangleProperty(); - virtual void ChildChanged( wxVariant& thisValue, - int childIndex, wxVariant& childValue ) const; + virtual wxVariant ChildChanged( wxVariant& thisValue, + int childIndex, + wxVariant& childValue ) const; virtual void RefreshChildren(); protected: @@ -128,7 +130,7 @@ class FormMain : public wxFrame { public: FormMain(const wxString& title, const wxPoint& pos, const wxSize& size ); - ~FormMain(); + ~FormMain(); wxPropertyGridManager* m_pPropGridManager; wxPropertyGrid* m_propGrid; @@ -150,6 +152,7 @@ public: void CreateGrid( int style, int extraStyle ); + void FinalizeFramePosition(); // These are used in CreateGrid(), and in tests to compose // grids for testing purposes. @@ -178,6 +181,7 @@ public: void OnEnableDisable( wxCommandEvent& event ); void OnHideShow( wxCommandEvent& event ); + void OnSetBackgroundColour( wxCommandEvent& event ); void OnClearModifyStatusClick( wxCommandEvent& event ); void OnFreezeClick( wxCommandEvent& event ); void OnDumpList( wxCommandEvent& event );