Don't define __STRICT_ANSI__, we should build both with and without it.

[wxWidgets.git] / include / wx / propgrid / propgridpagestate.h

diff --git a/include/wx/propgrid/propgridpagestate.h b/include/wx/propgrid/propgridpagestate.h
index d6171510d67f25d4d3679eb127659f89056b9ac3..77f38b28915277ae649053e38b5b4febf314d969 100644 (file)
--- a/include/wx/propgrid/propgridpagestate.h
+++ b/include/wx/propgrid/propgridpagestate.h
@@ -4,14 +4,15 @@
 // Author:      Jaakko Salli
 // Modified by:
 // 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"
@@ -435,7 +436,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 );
@@ -445,7 +446,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,
@@ -473,9 +474,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
@@ -554,6 +552,8 @@ public:
         return m_columnProportions[column];
     }
 
+    void ResetColumnSizes( int setSplitterFlags );
+
     wxPropertyCategory* GetPropertyCategory( const wxPGProperty* p ) const;
 
     wxPGProperty* GetPropertyByLabel( const wxString& name,
@@ -584,12 +584,14 @@ public:
                           unsigned int col,
                           bool subProps) const;
 
+    int GetColumnFullWidth(wxClientDC &dc, wxPGProperty *p, unsigned int col);
+
     /**
         Returns information about arbitrary position in the grid.
 
         @param pt
             Logical coordinates in the virtual grid space. Use
-            wxScrolledWindow::CalcUnscrolledPosition() if you need to
+            wxScrolled<T>::CalcUnscrolledPosition() if you need to
             translate a scrolled position into a logical one.
     */
     wxPropertyGridHitTestResult HitTest( const wxPoint& pt ) const;