X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f525476870e4baa3e5d303d94d8bc70026603b4c..a4301b8f14d21b7d28fc4f6a247b740d945ca6dc:/include/wx/propgrid/propgridpagestate.h diff --git a/include/wx/propgrid/propgridpagestate.h b/include/wx/propgrid/propgridpagestate.h index 5ba7674fbe..c25b9e5bac 100644 --- a/include/wx/propgrid/propgridpagestate.h +++ b/include/wx/propgrid/propgridpagestate.h @@ -6,12 +6,14 @@ // Created: 2008-08-24 // RCS-ID: $Id$ // Copyright: (c) Jaakko Salli -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_PROPGRID_PROPGRIDPAGESTATE_H_ #define _WX_PROPGRID_PROPGRIDPAGESTATE_H_ +#include "wx/defs.h" + #if wxUSE_PROPGRID #include "wx/propgrid/property.h" @@ -379,7 +381,6 @@ public: m_pIt = it.m_pIt; m_pIt->IncRef(); } -#ifndef SWIG const wxPGVIterator& operator=( const wxPGVIterator& it ) { if (this != &it) @@ -390,7 +391,6 @@ public: } return *this; } -#endif void Next() { m_pIt->Next(); } bool AtEnd() const { return m_pIt->m_it.AtEnd(); } wxPGProperty* GetProperty() const { return m_pIt->m_it.GetProperty(); } @@ -400,9 +400,6 @@ protected: // ----------------------------------------------------------------------- -#ifndef SWIG -// We won't need this class from wxPython - /** @class wxPropertyGridPageState Contains low-level property page information (properties, column widths, @@ -440,7 +437,7 @@ public: void CheckColumnWidths( int widthChange = 0 ); /** - Override this member function to add custom behavior on property + Override this member function to add custom behaviour on property deletion. */ virtual void DoDelete( wxPGProperty* item, bool doDelete = true ); @@ -450,7 +447,7 @@ public: wxPGProperty* DoGetItemAtY( int y ) const; /** - Override this member function to add custom behavior on property + Override this member function to add custom behaviour on property insertion. */ virtual wxPGProperty* DoInsert( wxPGProperty* parent, @@ -478,9 +475,6 @@ public: } } - /** Enables or disables given property and its subproperties. */ - bool DoEnableProperty( wxPGProperty* p, bool enable ); - /** Returns (precalculated) height of contained visible properties. */ unsigned int GetVirtualHeight() const @@ -552,6 +546,15 @@ public: void DoRemoveFromSelection( wxPGProperty* prop ); + void DoSetColumnProportion( unsigned int column, int proportion ); + + int DoGetColumnProportion( unsigned int column ) const + { + return m_columnProportions[column]; + } + + void ResetColumnSizes( int setSplitterFlags ); + wxPropertyCategory* GetPropertyCategory( const wxPGProperty* p ) const; wxPGProperty* GetPropertyByLabel( const wxString& name, @@ -587,7 +590,7 @@ public: @param pt Logical coordinates in the virtual grid space. Use - wxScrolledWindow::CalcUnscrolledPosition() if you need to + wxScrolled::CalcUnscrolledPosition() if you need to translate a scrolled position into a logical one. */ wxPropertyGridHitTestResult HitTest( const wxPoint& pt ) const; @@ -709,6 +712,9 @@ protected: /** List of indices of columns the user can edit by clicking it. */ wxArrayInt m_editableColumns; + /** Column proportions */ + wxArrayInt m_columnProportions; + double m_fSplitterX; /** Most recently added category. */ @@ -748,8 +754,6 @@ private: void InitNonCatMode(); }; -#endif // #ifndef SWIG - // ----------------------------------------------------------------------- #endif // wxUSE_PROPGRID