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 3f72dc92d45b9f89e4eedcd2c2e21bba2f9baaee..77f38b28915277ae649053e38b5b4febf314d969 100644 (file)
--- a/include/wx/propgrid/propgridpagestate.h
+++ b/include/wx/propgrid/propgridpagestate.h
@@ -4,7 +4,6 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     2008-08-24
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     2008-08-24

-// RCS-ID:      $Id$

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


@@ -12,6 +11,8 @@
 #ifndef _WX_PROPGRID_PROPGRIDPAGESTATE_H_
 #define _WX_PROPGRID_PROPGRIDPAGESTATE_H_
 
 #ifndef _WX_PROPGRID_PROPGRIDPAGESTATE_H_
 #define _WX_PROPGRID_PROPGRIDPAGESTATE_H_
 

+#include "wx/defs.h"
+

 #if wxUSE_PROPGRID
 
 #include "wx/propgrid/property.h"
 #if wxUSE_PROPGRID
 
 #include "wx/propgrid/property.h"


@@ -435,7 +436,7 @@ public:
     void CheckColumnWidths( int widthChange = 0 );
 
     /**
     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 );
         deletion.
     */
     virtual void DoDelete( wxPGProperty* item, bool doDelete = true );


@@ -445,7 +446,7 @@ public:
     wxPGProperty* DoGetItemAtY( int y ) const;
 
     /**
     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,
         insertion.
     */
     virtual wxPGProperty* DoInsert( wxPGProperty* parent,


@@ -583,12 +584,14 @@ public:
                           unsigned int col,
                           bool subProps) const;
 
                           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
     /**
         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;
             translate a scrolled position into a logical one.
     */
     wxPropertyGridHitTestResult HitTest( const wxPoint& pt ) const;