X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c4293cb91327247ad69e6ec8d589bfaa299db28..d5cc191c9cd48a915ce0dfc6e49511b2fddb6746:/samples/propgrid/propgrid.h

diff --git a/samples/propgrid/propgrid.h b/samples/propgrid/propgrid.h
index ef1048a78a..85f929ef7d 100644
--- a/samples/propgrid/propgrid.h
+++ b/samples/propgrid/propgrid.h
@@ -4,9 +4,9 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     2004-09-25
-// RCS-ID:      $Id:
+// RCS-ID:      $Id$
 // Copyright:   (c) Jaakko Salli
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SAMPLES_PROPGRID_PROPGRID_H_
@@ -26,9 +26,11 @@ public:
 
     virtual void OnSetValue();  // Override to allow image loading.
 
-    WX_PG_DECLARE_CHOICE_METHODS()
-    WX_PG_DECLARE_EVENT_METHODS()
-    WX_PG_DECLARE_CUSTOM_PAINT_METHODS()
+    virtual bool IntToValue( wxVariant& variant, int number, int argFlags = 0 ) const;
+    virtual bool OnEvent( wxPropertyGrid* propgrid, wxWindow* primary, wxEvent& event );
+    virtual wxSize OnMeasureImage( int item ) const;
+    virtual void OnCustomPaint( wxDC& dc,
+                                const wxRect& rect, wxPGPaintData& paintdata );
 
     void LoadThumbnails( size_t n );
 
@@ -62,7 +64,7 @@ inline bool operator == (const wxVector3f& a, const wxVector3f& b)
     return (a.x == b.x && a.y == b.y && a.z == b.z);
 }
 
-WX_PG_DECLARE_VARIANT_DATA(wxVector3fVariantData, wxVector3f, wxEMPTY_PARAMETER_VALUE)
+WX_PG_DECLARE_VARIANT_DATA(wxVector3f)
 
 class wxVectorProperty : public wxPGProperty
 {
@@ -70,11 +72,14 @@ 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();
 
-    WX_PG_DECLARE_PARENTAL_METHODS()
+    virtual wxVariant ChildChanged( wxVariant& thisValue,
+                                    int childIndex,
+                                    wxVariant& childValue ) const;
+    virtual void RefreshChildren();
 
 protected:
 };
@@ -92,7 +97,7 @@ inline bool operator == (const wxTriangle& a, const wxTriangle& b)
     return (a.a == b.a && a.b == b.b && a.c == b.c);
 }
 
-WX_PG_DECLARE_VARIANT_DATA(wxTriangleVariantData, wxTriangle, wxEMPTY_PARAMETER_VALUE)
+WX_PG_DECLARE_VARIANT_DATA(wxTriangle)
 
 class wxTriangleProperty : public wxPGProperty
 {
@@ -104,7 +109,10 @@ public:
                         const wxTriangle& value = wxTriangle() );
     virtual ~wxTriangleProperty();
 
-    WX_PG_DECLARE_PARENTAL_METHODS()
+    virtual wxVariant ChildChanged( wxVariant& thisValue,
+                                    int childIndex,
+                                    wxVariant& childValue ) const;
+    virtual void RefreshChildren();
 
 protected:
 };
@@ -122,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;
@@ -131,11 +139,17 @@ public:
     wxWindow*       m_panel;
     wxBoxSizer*     m_topSizer;
 
+#if wxUSE_LOGWINDOW
+    wxLogWindow*    m_logWindow;
+#endif
+
+    wxPGEditor*     m_pSampleMultiButtonEditor;
     wxPGChoices     m_combinedFlags;
 
     wxMenuItem*     m_itemCatColours;
     wxMenuItem*     m_itemFreeze;
     wxMenuItem*     m_itemEnable;
+    wxMenuItem*     m_itemVetoDragging;
 
     wxVariant       m_storedValues;
 
@@ -143,6 +157,7 @@ public:
 
 
     void CreateGrid( int style, int extraStyle );
+    void FinalizeFramePosition();
 
     // These are used in CreateGrid(), and in tests to compose
     // grids for testing purposes.
@@ -170,9 +185,13 @@ public:
     void OnContextMenu( wxContextMenuEvent& event );
 
     void OnEnableDisable( wxCommandEvent& event );
-    void OnHideShow( wxCommandEvent& event );
+    void OnSetReadOnly( wxCommandEvent& event );
+    void OnHide( wxCommandEvent& event );
+    void OnSetBackgroundColour( wxCommandEvent& event );
     void OnClearModifyStatusClick( wxCommandEvent& event );
     void OnFreezeClick( wxCommandEvent& event );
+    void OnEnableLabelEditing( wxCommandEvent& event );
+    void OnShowHeader( wxCommandEvent& event );
     void OnDumpList( wxCommandEvent& event );
     void OnCatColours( wxCommandEvent& event );
     void OnSetColumns( wxCommandEvent& event );
@@ -207,6 +226,8 @@ public:
     void OnIterate3Click( wxCommandEvent& event );
     void OnIterate4Click( wxCommandEvent& event );
 
+    void OnExtendedKeyNav( wxCommandEvent& event );
+
     void OnPropertyGridChange( wxPropertyGridEvent& event );
     void OnPropertyGridChanging( wxPropertyGridEvent& event );
     void OnPropertyGridSelect( wxPropertyGridEvent& event );
@@ -219,6 +240,11 @@ public:
     void OnPropertyGridKeyEvent( wxKeyEvent& event );
     void OnPropertyGridItemCollapse( wxPropertyGridEvent& event );
     void OnPropertyGridItemExpand( wxPropertyGridEvent& event );
+    void OnPropertyGridLabelEditBegin( wxPropertyGridEvent& event );
+    void OnPropertyGridLabelEditEnding( wxPropertyGridEvent& event );
+    void OnPropertyGridColBeginDrag( wxPropertyGridEvent& event );
+    void OnPropertyGridColDragging( wxPropertyGridEvent& event );
+    void OnPropertyGridColEndDrag( wxPropertyGridEvent& event );
 
     void OnAbout( wxCommandEvent& event );