Set wxSL_VERTICAL style in wxSlider demo page.

[wxWidgets.git] / samples / propgrid / propgrid.h

diff --git a/samples/propgrid/propgrid.h b/samples/propgrid/propgrid.h
index df754a2055d52186e17279ae5711207090911b10..e3c5dc5b6ad6534bbd03e148be59333d41aab64a 100644 (file)
--- a/samples/propgrid/propgrid.h
+++ b/samples/propgrid/propgrid.h
@@ -4,7 +4,7 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     2004-09-25
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     2004-09-25

-// RCS-ID:      $Id:
+// RCS-ID:      $Id$

 // Copyright:   (c) Jaakko Salli
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Jaakko Salli
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////


@@ -72,12 +72,13 @@ class wxVectorProperty : public wxPGProperty
 public:
 
     wxVectorProperty( const wxString& label = wxPG_LABEL,
 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 ~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:
     virtual void RefreshChildren();
 
 protected:


@@ -108,8 +109,9 @@ public:
                         const wxTriangle& value = wxTriangle() );
     virtual ~wxTriangleProperty();
 
                         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:
     virtual void RefreshChildren();
 
 protected:


@@ -128,7 +130,7 @@ class FormMain : public wxFrame
 {
 public:
     FormMain(const wxString& title, const wxPoint& pos, const wxSize& size );
 {
 public:
     FormMain(const wxString& title, const wxPoint& pos, const wxSize& size );

-       ~FormMain();
+    ~FormMain();

 
     wxPropertyGridManager*  m_pPropGridManager;
     wxPropertyGrid*     m_propGrid;
 
     wxPropertyGridManager*  m_pPropGridManager;
     wxPropertyGrid*     m_propGrid;


@@ -150,6 +152,7 @@ public:
 
 
     void CreateGrid( int style, int extraStyle );
 
 
     void CreateGrid( int style, int extraStyle );

+    void FinalizeFramePosition();

 
     // These are used in CreateGrid(), and in tests to compose
     // grids for testing purposes.
 
     // These are used in CreateGrid(), and in tests to compose
     // grids for testing purposes.


@@ -178,8 +181,10 @@ public:
 
     void OnEnableDisable( wxCommandEvent& event );
     void OnHideShow( wxCommandEvent& event );
 
     void OnEnableDisable( wxCommandEvent& event );
     void OnHideShow( wxCommandEvent& event );

+    void OnSetBackgroundColour( wxCommandEvent& event );

     void OnClearModifyStatusClick( wxCommandEvent& event );
     void OnFreezeClick( wxCommandEvent& event );
     void OnClearModifyStatusClick( wxCommandEvent& event );
     void OnFreezeClick( wxCommandEvent& event );

+    void OnEnableLabelEditing( wxCommandEvent& event );

     void OnDumpList( wxCommandEvent& event );
     void OnCatColours( wxCommandEvent& event );
     void OnSetColumns( wxCommandEvent& event );
     void OnDumpList( wxCommandEvent& event );
     void OnCatColours( wxCommandEvent& event );
     void OnSetColumns( wxCommandEvent& event );


@@ -226,6 +231,8 @@ public:
     void OnPropertyGridKeyEvent( wxKeyEvent& event );
     void OnPropertyGridItemCollapse( wxPropertyGridEvent& event );
     void OnPropertyGridItemExpand( wxPropertyGridEvent& event );
     void OnPropertyGridKeyEvent( wxKeyEvent& event );
     void OnPropertyGridItemCollapse( wxPropertyGridEvent& event );
     void OnPropertyGridItemExpand( wxPropertyGridEvent& event );

+    void OnPropertyGridLabelEditBegin( wxPropertyGridEvent& event );
+    void OnPropertyGridLabelEditEnding( wxPropertyGridEvent& event );

 
     void OnAbout( wxCommandEvent& event );
 
 
     void OnAbout( wxCommandEvent& event );