fixed array tests compilation and a bug in obj array test

[wxWidgets.git] / include / wx / generic / grid.h

diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index 0817377738268e8de2eb3caec631fbb8e33b174a..8445e3101a3545c3474b6b1bbfbb59a6f54df82a 100644 (file)
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -31,6 +31,7 @@
 #include "wx/combobox.h"
 #include "wx/dynarray.h"
 #include "wx/timer.h"
 #include "wx/combobox.h"
 #include "wx/dynarray.h"
 #include "wx/timer.h"

+#include "wx/clntdata.h"

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -98,7 +99,7 @@ class WXDLLEXPORT wxSpinCtrl;
 //     class is not documented and is not public at all
 // ----------------------------------------------------------------------------
 
 //     class is not documented and is not public at all
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGridCellWorker
+class WXDLLEXPORT wxGridCellWorker : public wxClientDataContainer

 {
 public:
     wxGridCellWorker() { m_nRef = 1; }
 {
 public:
     wxGridCellWorker() { m_nRef = 1; }


@@ -569,7 +570,7 @@ private:
 // class may be returned by wxGridTable::GetAttr().
 // ----------------------------------------------------------------------------
 
 // class may be returned by wxGridTable::GetAttr().
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGridCellAttr
+class WXDLLEXPORT wxGridCellAttr : public wxClientDataContainer

 {
 public:
     enum wxAttrKind
 {
 public:
     enum wxAttrKind


@@ -711,7 +712,7 @@ private:
 // the default implementation is reasonably efficient for the generic case,
 // but you might still wish to implement your own for some specific situations
 // if you have performance problems with the stock one
 // the default implementation is reasonably efficient for the generic case,
 // but you might still wish to implement your own for some specific situations
 // if you have performance problems with the stock one

-class WXDLLEXPORT wxGridCellAttrProvider
+class WXDLLEXPORT wxGridCellAttrProvider : public wxClientDataContainer

 {
 public:
     wxGridCellAttrProvider();
 {
 public:
     wxGridCellAttrProvider();


@@ -745,7 +746,7 @@ private:
 //////////////////////////////////////////////////////////////////////
 
 
 //////////////////////////////////////////////////////////////////////
 
 

-class WXDLLEXPORT wxGridTableBase : public wxObject
+class WXDLLEXPORT wxGridTableBase : public wxObject, public wxClientDataContainer

 {
 public:
     wxGridTableBase();
 {
 public:
     wxGridTableBase();


@@ -1405,6 +1406,8 @@ public:
     {
         m_extraWidth = extraWidth;
         m_extraHeight = extraHeight;
     {
         m_extraWidth = extraWidth;
         m_extraHeight = extraHeight;

+
+        CalcDimensions();

     }
 
     // Accessors for component windows
     }
 
     // Accessors for component windows