Always link with expat in monolithic build.

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

diff --git a/samples/propgrid/propgrid.h b/samples/propgrid/propgrid.h
index bec86c7991eee529ef367cfd29b71d8163648fe4..85f929ef7d4d58bd38648f56a3b86bc44d68de69 100644 (file)
--- a/samples/propgrid/propgrid.h
+++ b/samples/propgrid/propgrid.h
@@ -6,7 +6,7 @@
 // Created:     2004-09-25
 // RCS-ID:      $Id$
 // Copyright:   (c) Jaakko Salli
 // Created:     2004-09-25
 // RCS-ID:      $Id$
 // Copyright:   (c) Jaakko Salli

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SAMPLES_PROPGRID_PROPGRID_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SAMPLES_PROPGRID_PROPGRID_H_


@@ -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;


@@ -137,12 +139,17 @@ public:
     wxWindow*       m_panel;
     wxBoxSizer*     m_topSizer;
 
     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;
     wxPGEditor*     m_pSampleMultiButtonEditor;
     wxPGChoices     m_combinedFlags;
 
     wxMenuItem*     m_itemCatColours;
     wxMenuItem*     m_itemFreeze;
     wxMenuItem*     m_itemEnable;

+    wxMenuItem*     m_itemVetoDragging;

 
     wxVariant       m_storedValues;
 
 
     wxVariant       m_storedValues;
 


@@ -150,6 +157,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.


@@ -177,9 +185,13 @@ public:
     void OnContextMenu( wxContextMenuEvent& event );
 
     void OnEnableDisable( wxCommandEvent& event );
     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 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 );
     void OnDumpList( wxCommandEvent& event );
     void OnCatColours( wxCommandEvent& event );
     void OnSetColumns( wxCommandEvent& event );


@@ -214,6 +226,8 @@ public:
     void OnIterate3Click( wxCommandEvent& event );
     void OnIterate4Click( wxCommandEvent& event );
 
     void OnIterate3Click( wxCommandEvent& event );
     void OnIterate4Click( wxCommandEvent& event );
 

+    void OnExtendedKeyNav( wxCommandEvent& event );
+

     void OnPropertyGridChange( wxPropertyGridEvent& event );
     void OnPropertyGridChanging( wxPropertyGridEvent& event );
     void OnPropertyGridSelect( wxPropertyGridEvent& event );
     void OnPropertyGridChange( wxPropertyGridEvent& event );
     void OnPropertyGridChanging( wxPropertyGridEvent& event );
     void OnPropertyGridSelect( wxPropertyGridEvent& event );


@@ -226,6 +240,11 @@ 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 OnPropertyGridColBeginDrag( wxPropertyGridEvent& event );
+    void OnPropertyGridColDragging( wxPropertyGridEvent& event );
+    void OnPropertyGridColEndDrag( wxPropertyGridEvent& event );

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