Fix for VA 4.0

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

diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index 1e9d8cf35f40644808e7a3973a887e143bf5583a..438f9cd5ce813c4849e3a11971e33e79e231ed0f 100644 (file)
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -24,13 +24,14 @@
 #endif
 
 #include "wx/panel.h"
 #endif
 
 #include "wx/panel.h"

+#include "wx/scrolwin.h"

 #include "wx/string.h"
 #include "wx/scrolbar.h"
 #include "wx/event.h"
 #include "wx/textctrl.h"
 #include "wx/combobox.h"
 #include "wx/dynarray.h"
 #include "wx/string.h"
 #include "wx/scrolbar.h"
 #include "wx/event.h"
 #include "wx/textctrl.h"
 #include "wx/combobox.h"
 #include "wx/dynarray.h"

-
+#include "wx/timer.h"

 
 // Default parameters for wxGrid
 //
 
 // Default parameters for wxGrid
 //


@@ -48,12 +49,263 @@
 #define WXGRID_MIN_ROW_HEIGHT                 15
 #define WXGRID_MIN_COL_WIDTH                  15
 #define WXGRID_DEFAULT_SCROLLBAR_WIDTH        16
 #define WXGRID_MIN_ROW_HEIGHT                 15
 #define WXGRID_MIN_COL_WIDTH                  15
 #define WXGRID_DEFAULT_SCROLLBAR_WIDTH        16

-#define WXGRID_DEFAULT_TOPEDIT_WIDTH          300
-#define WXGRID_DEFAULT_TOPEDIT_HEIGHT         60

 
 

+// ----------------------------------------------------------------------------
+// forward declarations
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxGrid;
+class WXDLLEXPORT wxGridCellAttr;
+class WXDLLEXPORT wxGridCellAttrProviderData;
+class WXDLLEXPORT wxGridColLabelWindow;
+class WXDLLEXPORT wxGridCornerLabelWindow;
+class WXDLLEXPORT wxGridRowLabelWindow;
+class WXDLLEXPORT wxGridTableBase;
+class WXDLLEXPORT wxGridWindow;
+
+// ----------------------------------------------------------------------------
+// wxGridCellRenderer: this class is responsible for actually drawing the cell
+// in the grid. You may pass it to the wxGridCellAttr (below) to change the
+// format of one given cell or to wxGrid::SetDefaultRenderer() to change the
+// view of all cells. This is an ABC, you will normally use one of the
+// predefined derived classes or derive oyur own class from it.
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxGridCellRenderer
+{
+public:
+    // draw the given cell on the provided DC inside the given rectangle
+    // using the style specified by the attribute and the default or selected
+    // state corresponding to the isSelected value.
+    //
+    // this pure virtual function has a default implementation which will
+    // prepare the DC using the given attribute: it will draw the rectangle
+    // with the bg colour from attr and set the text colour and font
+    virtual void Draw(wxGrid& grid,
+                      wxGridCellAttr& attr,
+                      wxDC& dc,
+                      const wxRect& rect,
+                      int row, int col,
+                      bool isSelected) = 0;
+};
+
+// the default renderer for the cells containing string data
+class WXDLLEXPORT wxGridCellStringRenderer : public wxGridCellRenderer
+{
+public:
+    // draw the string
+    virtual void Draw(wxGrid& grid,
+                      wxGridCellAttr& attr,
+                      wxDC& dc,
+                      const wxRect& rect,
+                      int row, int col,
+                      bool isSelected);
+};
+
+
+// ----------------------------------------------------------------------------
+// wxGridCellEditor:  This class is responsible for providing and manipulating
+// the in-place edit controls for the grid.  Instances of wxGridCellEditor
+// (actually, instances of derived classes since it is an ABC) can be
+// associated with the cell attributes for individual cells, rows, columns, or
+// even for the entire grid.
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxGridCellEditor
+{
+public:
+    wxGridCellEditor();
+    virtual ~wxGridCellEditor();
+
+    bool IsCreated() { return m_control != NULL; }
+
+    // Creates the actual edit control
+    virtual void Create(wxWindow* parent,
+                        wxWindowID id,
+                        const wxPoint& pos,
+                        const wxSize& size,
+                        wxEvtHandler* evtHandler) = 0;
+
+    // Size and position the edit control
+    virtual void SetSize(const wxRect& rect);
+
+    // Show or hide the edit control
+    virtual void Show(bool show);
+
+    // Fetch the value from the table and prepare the edit control
+    // to begin editing.  Set the focus to the edit control.
+    virtual void BeginEdit(int row, int col, wxGrid* grid,
+                           wxGridCellAttr* attr) = 0;
+
+    // Complete the editing of the current cell.  If saveValue is
+    // true then send the new value back to the table.  Returns true
+    // if the value has changed.  If necessary, the control may be
+    // destroyed.
+    virtual bool EndEdit(int row, int col,  bool saveValue,
+                         wxGrid* grid, wxGridCellAttr* attr) = 0;
+
+    // Reset the value in the control back to its starting value
+    virtual void Reset() = 0;

 
 

-class wxGrid;
+    // Some types of controls on some platforms may need some help
+    // with the Return key.
+    virtual void HandleReturn(wxKeyEvent& event);

 
 

+    // Final cleanup
+    virtual void Destroy();
+
+protected:
+    wxControl*  m_control;
+};
+
+
+class WXDLLEXPORT wxGridCellTextEditor : public wxGridCellEditor
+{
+public:
+    wxGridCellTextEditor();
+
+    virtual void Create(wxWindow* parent,
+                        wxWindowID id,
+                        const wxPoint& pos,
+                        const wxSize& size,
+                        wxEvtHandler* evtHandler);
+
+    virtual void BeginEdit(int row, int col, wxGrid* grid,
+                           wxGridCellAttr* attr);
+
+    virtual bool EndEdit(int row, int col,  bool saveValue,
+                         wxGrid* grid, wxGridCellAttr* attr);
+
+    virtual void Reset();
+    virtual void HandleReturn(wxKeyEvent& event);
+
+
+private:
+    wxString m_startValue;
+};
+
+// ----------------------------------------------------------------------------
+// wxGridCellAttr: this class can be used to alter the cells appearance in
+// the grid by changing their colour/font/... from default. An object of this
+// class may be returned by wxGridTable::GetAttr().
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxGridCellAttr
+{
+public:
+    // ctors
+    wxGridCellAttr()
+    {
+        Init();
+        SetAlignment(0, 0);
+    }
+
+    wxGridCellAttr(const wxColour& colText,
+                   const wxColour& colBack,
+                   const wxFont& font,
+                   int hAlign,
+                   int vAlign)
+        : m_colText(colText), m_colBack(colBack), m_font(font)
+    {
+        Init();
+        SetAlignment(hAlign, vAlign);
+    }
+
+    // default copy ctor ok
+
+    // this class is ref counted: it is created with ref count of 1, so
+    // calling DecRef() once will delete it. Calling IncRef() allows to lock
+    // it until the matching DecRef() is called
+    void IncRef() { m_nRef++; }
+    void DecRef() { if ( !--m_nRef ) delete this; }
+    void SafeIncRef() { if ( this ) IncRef(); }
+    void SafeDecRef() { if ( this ) DecRef(); }
+
+    // setters
+    void SetTextColour(const wxColour& colText) { m_colText = colText; }
+    void SetBackgroundColour(const wxColour& colBack) { m_colBack = colBack; }
+    void SetFont(const wxFont& font) { m_font = font; }
+    void SetAlignment(int hAlign, int vAlign)
+    {
+        m_hAlign = hAlign;
+        m_vAlign = vAlign;
+    }
+
+    // takes ownership of the pointer
+    void SetRenderer(wxGridCellRenderer *renderer)
+        { delete m_renderer; m_renderer = renderer; }
+
+    // accessors
+    bool HasTextColour() const { return m_colText.Ok(); }
+    bool HasBackgroundColour() const { return m_colBack.Ok(); }
+    bool HasFont() const { return m_font.Ok(); }
+    bool HasAlignment() const { return m_hAlign || m_vAlign; }
+    bool HasRenderer() const { return m_renderer != NULL; }
+
+    const wxColour& GetTextColour() const;
+    const wxColour& GetBackgroundColour() const;
+    const wxFont& GetFont() const;
+    void GetAlignment(int *hAlign, int *vAlign) const;
+    wxGridCellRenderer *GetRenderer() const;
+
+    void SetDefAttr(wxGridCellAttr* defAttr) { m_defGridAttr = defAttr; }
+
+private:
+    // the common part of all ctors
+    void Init() { m_nRef = 1; m_renderer = (wxGridCellRenderer *)NULL; }
+
+    // the dtor is private because only DecRef() can delete us
+    ~wxGridCellAttr() { delete m_renderer; }
+
+    // the ref count - when it goes to 0, we die
+    size_t   m_nRef;
+
+    wxColour m_colText,
+             m_colBack;
+    wxFont   m_font;
+    int      m_hAlign,
+             m_vAlign;
+
+    wxGridCellRenderer *m_renderer;
+    wxGridCellAttr* m_defGridAttr;
+
+    // suppress the stupid gcc warning about the class having private dtor and
+    // no friends
+    friend class wxGridCellAttrDummyFriend;
+};
+
+// ----------------------------------------------------------------------------
+// wxGridCellAttrProvider: class used by wxGridTableBase to retrieve/store the
+// cell attributes.
+// ----------------------------------------------------------------------------
+
+// implementation note: we separate it from wxGridTableBase because we wish to
+// avoid deriving a new table class if possible, and sometimes it will be
+// enough to just derive another wxGridCellAttrProvider instead
+//
+// 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
+{
+public:
+    wxGridCellAttrProvider();
+    virtual ~wxGridCellAttrProvider();
+
+    // DecRef() must be called on the returned pointer
+    virtual wxGridCellAttr *GetAttr(int row, int col) const;
+
+    // all these functions take ownership of the pointer, don't call DecRef()
+    // on it
+    virtual void SetAttr(wxGridCellAttr *attr, int row, int col);
+    virtual void SetRowAttr(wxGridCellAttr *attr, int row);
+    virtual void SetColAttr(wxGridCellAttr *attr, int col);
+
+private:
+    void InitData();
+
+    wxGridCellAttrProviderData *m_data;
+};

 
 //////////////////////////////////////////////////////////////////////
 //
 
 //////////////////////////////////////////////////////////////////////
 //


@@ -62,11 +314,9 @@ class wxGrid;
 //////////////////////////////////////////////////////////////////////
 
 
 //////////////////////////////////////////////////////////////////////
 
 

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

 {
 {

-    wxGrid * m_view;
-    
-  public:
+public:

     wxGridTableBase();
     virtual ~wxGridTableBase();
 
     wxGridTableBase();
     virtual ~wxGridTableBase();
 


@@ -77,7 +327,7 @@ class wxGridTableBase : public wxObject
     virtual wxString GetValue( int row, int col ) = 0;
     virtual void SetValue( int row, int col, const wxString& s ) = 0;
     virtual bool IsEmptyCell( int row, int col ) = 0;
     virtual wxString GetValue( int row, int col ) = 0;
     virtual void SetValue( int row, int col, const wxString& s ) = 0;
     virtual bool IsEmptyCell( int row, int col ) = 0;

-    
+

     // Overriding these is optional
     //
     virtual void SetView( wxGrid *grid ) { m_view = grid; }
     // Overriding these is optional
     //
     virtual void SetView( wxGrid *grid ) { m_view = grid; }


@@ -93,17 +343,43 @@ class wxGridTableBase : public wxObject
 
     virtual wxString GetRowLabelValue( int row );
     virtual wxString GetColLabelValue( int col );
 
     virtual wxString GetRowLabelValue( int row );
     virtual wxString GetColLabelValue( int col );

-    virtual void SetRowLabelValue( int row, const wxString& ) {}
-    virtual void SetColLabelValue( int col, const wxString& ) {}
-    
+    virtual void SetRowLabelValue( int WXUNUSED(row), const wxString& ) {}
+    virtual void SetColLabelValue( int WXUNUSED(col), const wxString& ) {}
+
+    // Attribute handling
+    //
+
+    // give us the attr provider to use - we take ownership of the pointer
+    void SetAttrProvider(wxGridCellAttrProvider *attrProvider);
+
+    // get the currently used attr provider (may be NULL)
+    wxGridCellAttrProvider *GetAttrProvider() const { return m_attrProvider; }
+
+    // by default forwarded to wxGridCellAttrProvider if any. May be
+    // overridden to handle attributes directly in this class.
+    virtual wxGridCellAttr *GetAttr( int row, int col );
+
+    // these functions take ownership of the pointer
+    virtual void SetAttr(wxGridCellAttr* attr, int row, int col);
+    virtual void SetRowAttr(wxGridCellAttr *attr, int row);
+    virtual void SetColAttr(wxGridCellAttr *attr, int col);
+
+private:
+    wxGrid * m_view;
+    wxGridCellAttrProvider *m_attrProvider;
+

     DECLARE_ABSTRACT_CLASS( wxGridTableBase );
 };
 
 
     DECLARE_ABSTRACT_CLASS( wxGridTableBase );
 };
 
 

+// ----------------------------------------------------------------------------
+// wxGridTableMessage
+// ----------------------------------------------------------------------------

 
 // IDs for messages sent from grid table to view
 //
 
 // IDs for messages sent from grid table to view
 //

-enum wxGridTableRequest {
+enum wxGridTableRequest
+{

     wxGRIDTABLE_REQUEST_VIEW_GET_VALUES = 2000,
     wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES,
     wxGRIDTABLE_NOTIFY_ROWS_INSERTED,
     wxGRIDTABLE_REQUEST_VIEW_GET_VALUES = 2000,
     wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES,
     wxGRIDTABLE_NOTIFY_ROWS_INSERTED,


@@ -114,14 +390,9 @@ enum wxGridTableRequest {
     wxGRIDTABLE_NOTIFY_COLS_DELETED
 };
 
     wxGRIDTABLE_NOTIFY_COLS_DELETED
 };
 

-class wxGridTableMessage
+class WXDLLEXPORT wxGridTableMessage

 {
 {

-    wxGridTableBase *m_table;
-    int m_id;
-    int m_comInt1;
-    int m_comInt2;
-    
-  public:
+public:

     wxGridTableMessage();
     wxGridTableMessage( wxGridTableBase *table, int id,
                         int comInt1 = -1,
     wxGridTableMessage();
     wxGridTableMessage( wxGridTableBase *table, int id,
                         int comInt1 = -1,


@@ -134,7 +405,13 @@ class wxGridTableMessage
     void SetCommandInt( int comInt1 ) { m_comInt1 = comInt1; }
     int  GetCommandInt() { return m_comInt1; }
     void SetCommandInt2( int comInt2 ) { m_comInt2 = comInt2; }
     void SetCommandInt( int comInt1 ) { m_comInt1 = comInt1; }
     int  GetCommandInt() { return m_comInt1; }
     void SetCommandInt2( int comInt2 ) { m_comInt2 = comInt2; }

-    int  GetCommandInt2() { return m_comInt2; }    
+    int  GetCommandInt2() { return m_comInt2; }
+
+private:
+    wxGridTableBase *m_table;
+    int m_id;
+    int m_comInt1;
+    int m_comInt2;

 };
 
 
 };
 
 


@@ -143,7 +420,8 @@ class wxGridTableMessage
 // A 2-dimensional array of strings for data values
 //
 
 // A 2-dimensional array of strings for data values
 //
 

-WX_DECLARE_OBJARRAY(wxArrayString, wxGridStringArray);
+WX_DECLARE_EXPORTED_OBJARRAY(wxArrayString, wxGridStringArray);
+

 
 
 // ------ wxGridStringTable
 
 
 // ------ wxGridStringTable


@@ -152,17 +430,9 @@ WX_DECLARE_OBJARRAY(wxArrayString, wxGridStringArray);
 // that are stored in memory
 //
 
 // that are stored in memory
 //
 

-class wxGridStringTable : public wxGridTableBase
+class WXDLLEXPORT wxGridStringTable : public wxGridTableBase

 {
 {

-    wxGridStringArray m_data;
-
-    // These only get used if you set your own labels, otherwise the
-    // GetRow/ColLabelValue functions return wxGridTableBase defaults
-    //
-    wxArrayString     m_rowLabels;
-    wxArrayString     m_colLabels;
-    
-  public:
+public:

     wxGridStringTable();
     wxGridStringTable( int numRows, int numCols );
     ~wxGridStringTable();
     wxGridStringTable();
     wxGridStringTable( int numRows, int numCols );
     ~wxGridStringTable();


@@ -174,7 +444,7 @@ class wxGridStringTable : public wxGridTableBase
     wxString GetValue( int row, int col );
     void SetValue( int row, int col, const wxString& s );
     bool IsEmptyCell( int row, int col );
     wxString GetValue( int row, int col );
     void SetValue( int row, int col, const wxString& s );
     bool IsEmptyCell( int row, int col );

-    
+

     // overridden functions from wxGridTableBase
     //
     void Clear();
     // overridden functions from wxGridTableBase
     //
     void Clear();


@@ -189,7 +459,16 @@ class wxGridStringTable : public wxGridTableBase
     void SetColLabelValue( int col, const wxString& );
     wxString GetRowLabelValue( int row );
     wxString GetColLabelValue( int col );
     void SetColLabelValue( int col, const wxString& );
     wxString GetRowLabelValue( int row );
     wxString GetColLabelValue( int col );

-    
+
+private:
+    wxGridStringArray m_data;
+
+    // These only get used if you set your own labels, otherwise the
+    // GetRow/ColLabelValue functions return wxGridTableBase defaults
+    //
+    wxArrayString     m_rowLabels;
+    wxArrayString     m_colLabels;
+

     DECLARE_DYNAMIC_CLASS( wxGridStringTable )
 };
 
     DECLARE_DYNAMIC_CLASS( wxGridStringTable )
 };
 


@@ -201,12 +480,9 @@ class wxGridStringTable : public wxGridTableBase
 //
 //////////////////////////////////////////////////////////////////////
 
 //
 //////////////////////////////////////////////////////////////////////
 

-class wxGridCellCoords
+class WXDLLEXPORT wxGridCellCoords

 {
 {

-    long m_row;
-    long m_col;
-    
-  public:
+public:

     wxGridCellCoords() { m_row = m_col = -1; }
     wxGridCellCoords( int r, int c ) { m_row = r; m_col = c; }
 
     wxGridCellCoords() { m_row = m_col = -1; }
     wxGridCellCoords( int r, int c ) { m_row = r; m_col = c; }
 


@@ -217,7 +493,7 @@ class wxGridCellCoords
     long GetCol() const { return m_col; }
     void SetCol( long n ) { m_col = n; }
     void Set( long row, long col ) { m_row = row; m_col = col; }
     long GetCol() const { return m_col; }
     void SetCol( long n ) { m_col = n; }
     void Set( long row, long col ) { m_row = row; m_col = col; }

-    
+

     wxGridCellCoords& operator=( const wxGridCellCoords& other )
     {
         if ( &other != this )
     wxGridCellCoords& operator=( const wxGridCellCoords& other )
     {
         if ( &other != this )


@@ -242,6 +518,10 @@ class wxGridCellCoords
     {
         return (m_row == -1 && m_col == -1 );
     }
     {
         return (m_row == -1 && m_col == -1 );
     }

+
+private:
+    long m_row;
+    long m_col;

 };
 
 
 };
 
 


@@ -250,24 +530,22 @@ class wxGridCellCoords
 extern wxGridCellCoords wxGridNoCellCoords;
 extern wxRect           wxGridNoCellRect;
 
 extern wxGridCellCoords wxGridNoCellCoords;
 extern wxRect           wxGridNoCellRect;
 

+// An array of cell coords...
+//
+WX_DECLARE_EXPORTED_OBJARRAY(wxGridCellCoords, wxGridCellCoordsArray);
+
+

 
 // This set of classes is to provide for the use of different types of
 
 // This set of classes is to provide for the use of different types of

-// cell edit controls in the grid while avoiding the wx class info 
+// cell edit controls in the grid while avoiding the wx class info

 // system in deference to wxPython
 
 // system in deference to wxPython
 

-class wxGridTextCtrl : public wxTextCtrl
+class WXDLLEXPORT wxGridTextCtrl : public wxTextCtrl

 {
 {

-    // TRUE for controls placed over cells,
-    // FALSE for a control on a grid control panel
-    bool m_isCellControl;  
-
-    wxString startValue;
-
-    void OnKeyDown( wxKeyEvent& );
-    
-  public:
+public:

     wxGridTextCtrl() {}
     wxGridTextCtrl( wxWindow *,
     wxGridTextCtrl() {}
     wxGridTextCtrl( wxWindow *,

+                    wxGrid *,

                     bool isCellControl,
                     wxWindowID id,
                     const wxString& value = wxEmptyString,
                     bool isCellControl,
                     wxWindowID id,
                     const wxString& value = wxEmptyString,


@@ -277,204 +555,114 @@ class wxGridTextCtrl : public wxTextCtrl
 
     void     SetStartValue( const wxString& );
     wxString GetStartValue() { return startValue; }
 
     void     SetStartValue( const wxString& );
     wxString GetStartValue() { return startValue; }

-    
-    DECLARE_DYNAMIC_CLASS( wxGridTextCtrl )
-    DECLARE_EVENT_TABLE()
-};
-

 
 

-class wxGrid : public wxPanel
-{
-    DECLARE_DYNAMIC_CLASS( wxGrid )
+private:
+    wxGrid *m_grid;

 
 

-  private:
-    bool m_created;
+    // TRUE for controls placed over cells,
+    // FALSE for a control on a grid control panel
+    bool m_isCellControl;

 
 

-    wxGridTableBase *m_table;
+    wxString startValue;

 
 

-    int m_left;
-    int m_top;
-    int m_right;
-    int m_bottom;
-    
-    int m_numRows;
-    int m_numCols;
+    void OnKeyDown( wxKeyEvent& );

 
 

-    wxGridCellCoords m_currentCellCoords;
-    bool             m_currentCellHighlighted;
+    DECLARE_DYNAMIC_CLASS( wxGridTextCtrl )
+    DECLARE_EVENT_TABLE()
+};

 
 

-    wxGridCellCoords m_selectedTopLeft;
-    wxGridCellCoords m_selectedBottomRight;
-        
-    int        m_defaultRowHeight;
-    wxArrayInt m_rowHeights;
-    wxArrayInt m_rowBottoms;
+//-----------------------------------------------------------------------------
+// wxGridEditTimer (internal)
+//-----------------------------------------------------------------------------

 
 

-    int        m_defaultColWidth;
-    wxArrayInt m_colWidths;
-    wxArrayInt m_colRights;
+class WXDLLEXPORT wxGridEditTimer: public wxTimer
+{
+ private:
+   wxGrid  *m_owner;

 
 

-    int m_rowLabelWidth;
-    int m_colLabelHeight;
+ public:
+   wxGridEditTimer( wxGrid *owner );
+   void Notify();
+};

 
 

-    wxColour   m_labelBackgroundColour;
-    wxColour   m_labelTextColour;
-    wxFont     m_labelFont;
-    
-    int        m_rowLabelHorizAlign;
-    int        m_rowLabelVertAlign;
-    int        m_colLabelHorizAlign;
-    int        m_colLabelVertAlign;
+// ----------------------------------------------------------------------------
+// wxGrid
+// ----------------------------------------------------------------------------

 
 

-    bool       m_defaultRowLabelValues;
-    bool       m_defaultColLabelValues;
+class WXDLLEXPORT wxGrid : public wxScrolledWindow
+{
+public:
+    wxGrid()
+        {
+            m_table          = (wxGridTableBase *) NULL;
+            m_gridWin        = (wxGridWindow *) NULL;
+            m_rowLabelWin    = (wxGridRowLabelWindow *) NULL;
+            m_colLabelWin    = (wxGridColLabelWindow *) NULL;
+            m_cornerLabelWin = (wxGridCornerLabelWindow *) NULL;
+            m_cellEditCtrl   = (wxWindow *) NULL;
+        }

 
 

-    wxColour   m_gridLineColour;
-    bool       m_gridLinesEnabled;
+    wxGrid( wxWindow *parent,
+            wxWindowID id,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            long style = 0,
+            const wxString& name = wxPanelNameStr );

 
 

-    wxFont     m_defaultCellFont;
-    
-    wxScrollBar * m_horizScrollBar;
-    wxScrollBar * m_vertScrollBar;
-    int m_scrollBarWidth;
-    int m_scrollPosX;
-    int m_scrollPosY;
-    int m_wholeColsVisible;
-    int m_wholeRowsVisible;
+    ~wxGrid();

 
 

-    bool m_inOnKeyDown;
-    bool m_inOnText;
-    bool m_firstPaint;
-    int  m_batchCount;
+    bool CreateGrid( int numRows, int numCols );

 
 

-    int  m_cursorMode;
-    enum { WXGRID_CURSOR_DEFAULT,
-           WXGRID_CURSOR_SELECT_CELL,
-           WXGRID_CURSOR_RESIZE_ROW,
-           WXGRID_CURSOR_RESIZE_COL,
-           WXGRID_CURSOR_SELECT_ROW,
-           WXGRID_CURSOR_SELECT_COL
-    };

 
 

-    int  m_dragLastPos;
-    int  m_dragRowOrCol;
-    bool m_isDragging;
+    // ------ grid dimensions
+    //
+    int      GetNumberRows() { return  m_numRows; }
+    int      GetNumberCols() { return  m_numCols; }

 
 

-    wxGridCellCoords m_selectionStart;
-    
-    wxCursor m_rowResizeCursor;
-    wxCursor m_colResizeCursor;

 
 

-    bool       m_editable;  // applies to whole grid
-    int        m_editCtrlType;  // for current cell
-    wxWindow*  m_cellEditCtrl;
-    bool       m_cellEditCtrlEnabled;
-    wxWindow*  m_topEditCtrl;
-    bool       m_topEditCtrlEnabled;
-    
-    // ------ internal init and update functions
-    //
-    void Create();                 
-    void Init();
-    void CalcDimensions();
-    bool IsOnScreen();    
-    bool Redimension( wxGridTableMessage& );
-    
-    // ------ event processing
+    // ------ display update functions

     //
     //

-    bool SendEvent( const wxEventType,
-                    int row, int col,
-                    wxMouseEvent& );
-    
-    bool SendEvent( const wxEventType,
-                    int row, int col );
-    
-    void OnPaint( wxPaintEvent& );
-    void OnSize( wxSizeEvent& );
-    void OnMouse( wxMouseEvent& );
-    void OnKeyDown( wxKeyEvent& );
-    void OnText( wxKeyEvent& );
-    void OnGridScroll( wxScrollEvent& );
+    void CalcRowLabelsExposed( wxRegion& reg );

 
 

-    void SelectCell( const wxGridCellCoords& coords );
-    void SelectCell( int row, int col )
-        { SelectCell( wxGridCellCoords(row, col) ); }
+    void CalcColLabelsExposed( wxRegion& reg );
+    void CalcCellsExposed( wxRegion& reg );

 
 
 
 

-    // ------ edit controls
+    // ------ event handlers

     //
     //

-    void ShowCellEditControl();
-    void HideCellEditControl();
-    void SaveEditControlValue();
+    void ProcessRowLabelMouseEvent( wxMouseEvent& event );
+    void ProcessColLabelMouseEvent( wxMouseEvent& event );
+    void ProcessCornerLabelMouseEvent( wxMouseEvent& event );
+    void ProcessGridCellMouseEvent( wxMouseEvent& event );
+    bool ProcessTableMessage( wxGridTableMessage& );

 
 

-    
-    // ------ grid location functions
-    //
-    int  XYToArea( int x, int y );  // returns one of the following...
-    enum { WXGRID_NOAREA,
-           WXGRID_ROWLABEL,
-           WXGRID_ROWLABEL_EDGE,
-           WXGRID_COLLABEL,
-           WXGRID_COLLABEL_EDGE,
-           WXGRID_CORNERLABEL,
-           WXGRID_CELL };
-    
-    void XYToCell( int x, int y, wxGridCellCoords& );
-    int  YToRow( int y );
-    int  XToCol( int x );
+    void DoEndDragResizeRow();
+    void DoEndDragResizeCol();

 
 

-    int  YToEdgeOfRow( int y );
-    int  XToEdgeOfCol( int x );
+    wxGridTableBase * GetTable() const { return m_table; }
+    bool SetTable( wxGridTableBase *table, bool takeOwnership=FALSE );

 
 

-    wxRect CellToRect( int row, int col );
-    wxRect CellToRect( const wxGridCellCoords& coords )
-        { return CellToRect( coords.GetRow(), coords.GetCol() ); }
+    void ClearGrid();
+    bool InsertRows( int pos = 0, int numRows = 1, bool updateLabels=TRUE );
+    bool AppendRows( int numRows = 1, bool updateLabels=TRUE );
+    bool DeleteRows( int pos = 0, int numRows = 1, bool updateLabels=TRUE );
+    bool InsertCols( int pos = 0, int numCols = 1, bool updateLabels=TRUE );
+    bool AppendCols( int numCols = 1, bool updateLabels=TRUE );
+    bool DeleteCols( int pos = 0, int numCols = 1, bool updateLabels=TRUE );
+
+    void DrawGridCellArea( wxDC& dc );
+    void DrawCellBorder( wxDC& dc, const wxGridCellCoords& );
+    void DrawAllGridLines( wxDC& dc, const wxRegion & reg );
+    void DrawCell( wxDC& dc, const wxGridCellCoords& );

 
 

-    bool MoveCursorUp();
-    bool MoveCursorDown();
-    bool MoveCursorLeft();
-    bool MoveCursorRight();
-    bool MovePageDown();
-    bool MovePageUp();
-    bool MoveCursorUpBlock();
-    bool MoveCursorDownBlock();
-    bool MoveCursorLeftBlock();
-    bool MoveCursorRightBlock();
-    
-    
-    // ------ label drawing functions
-    //
-    void DrawLabelAreas( wxDC& dc );
-    void DrawColLabelBorders( wxDC& dc );
-    void DrawColLabels( wxDC& dc );
-    void DrawColLabel( wxDC& dc, const wxRect&, int col );
-    void DrawRowLabelBorders( wxDC& dc );

     void DrawRowLabels( wxDC& dc );
     void DrawRowLabels( wxDC& dc );

-    void DrawRowLabel( wxDC& dc, const wxRect&, int col );
+    void DrawRowLabel( wxDC& dc, int row );

 
 

+    void DrawColLabels( wxDC& dc );
+    void DrawColLabel( wxDC& dc, int col );

 
 

-    // ------ cell drawing functions
-    //
-    void DrawCellArea( wxDC& dc );
-    void DrawGridLines( wxDC& dc );
-    void DrawCells( wxDC& dc );
-    void DrawCellBackground( wxDC& dc, const wxRect&, int row, int col );
-    void DrawCellValue( wxDC& dc, const wxRect&, int row, int col );
-
-    // this one is useful when you just need to draw one or a few
-    // cells
-    void DrawCell( int row, int col );
-    void DrawCell( const wxGridCellCoords& coords )
-        { DrawCell( coords.GetRow(), coords.GetCol() ); }
-    
-    void DrawCellHighlight( wxDC& dc, int row, int col );
-    void DrawCellHighlight( wxDC& dc, wxGridCellCoords& coords )
-        { DrawCellHighlight( dc, coords.GetRow(), coords.GetCol() ); }
-    void ShowCurrentCellHighlight( wxDC& dc );
-    void HideCurrentCellHighlight( wxDC& dc );
-            
-
-    // ------ generic drawing functions
+
+    // ------ Cell text drawing functions

     //
     void DrawTextRectangle( wxDC& dc, const wxString&, const wxRect&,
                             int horizontalAlignment = wxLEFT,
     //
     void DrawTextRectangle( wxDC& dc, const wxString&, const wxRect&,
                             int horizontalAlignment = wxLEFT,


@@ -484,88 +672,90 @@ class wxGrid : public wxPanel
     // strings and return the number of lines
     //
     void StringToLines( const wxString& value, wxArrayString& lines );
     // strings and return the number of lines
     //
     void StringToLines( const wxString& value, wxArrayString& lines );

-    
+

     void GetTextBoxSize( wxDC& dc,
                          wxArrayString& lines,
                          long *width, long *height );
 
     void GetTextBoxSize( wxDC& dc,
                          wxArrayString& lines,
                          long *width, long *height );
 

-    
-    // ------ functions to get/send data (see also public functions)
+
+    // ------
+    // Code that does a lot of grid modification can be enclosed
+    // between BeginBatch() and EndBatch() calls to avoid screen
+    // flicker

     //
     //

-    bool GetModelValues();
-    bool SetModelValues();
+    void     BeginBatch() { m_batchCount++; }
+    void     EndBatch() { if ( m_batchCount > 0 ) m_batchCount--; }
+    int      GetBatchCount() { return m_batchCount; }

 
 
 
 

-    ////////////////////// Public section ////////////////////
-    
-  public:
-    wxGrid()
-        { Create(); }
-    
-    wxGrid( wxWindow *parent,
-            wxWindowID id,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = 0,
-            const wxString& name = wxPanelNameStr )
-        : wxPanel( parent, id, pos, size, style, name )
-        {
-            Create();
-        }
-        
-    ~wxGrid();    
+    // ------ edit control functions
+    //
+    bool IsEditable() { return m_editable; }
+    void EnableEditing( bool edit );

 
 

-    bool CreateGrid( int numRows = WXGRID_DEFAULT_NUMBER_ROWS,
-                     int numCols = WXGRID_DEFAULT_NUMBER_COLS );
+    void     EnableCellEditControl( bool enable );

 
 

-    wxGridTableBase * GetTable() const { return m_table; }
-    void SetTable( wxGridTableBase *table ) { m_table = table; }
+    bool     IsCellEditControlEnabled()
+             { return (m_cellEditCtrl && m_cellEditCtrlEnabled); }

 
 

-    void ClearGrid();
-    bool InsertRows( int pos = 0, int numRows = 1, bool updateLabels=TRUE );
-    bool AppendRows( int numRows = 1, bool updateLabels=TRUE );
-    bool DeleteRows( int pos = 0, int numRows = 1, bool updateLabels=TRUE );
-    bool InsertCols( int pos = 0, int numCols = 1, bool updateLabels=TRUE );
-    bool AppendCols( int numCols = 1, bool updateLabels=TRUE );
-    bool DeleteCols( int pos = 0, int numCols = 1, bool updateLabels=TRUE );    
+    void ShowCellEditControl();
+    void HideCellEditControl();
+    void SetEditControlValue( const wxString& s = wxEmptyString );
+    void SaveEditControlValue();
+
+
+    // ------ grid location functions
+    //  Note that all of these functions work with the logical coordinates of
+    //  grid cells and labels so you will need to convert from device
+    //  coordinates for mouse events etc.
+    //
+    void XYToCell( int x, int y, wxGridCellCoords& );
+    int  YToRow( int y );
+    int  XToCol( int x );
+
+    int  YToEdgeOfRow( int y );
+    int  XToEdgeOfCol( int x );

 
 

-    // ------ editing and edit controls
-    //
-    bool IsEditable() { return m_editable; }
-    void EnableEditing( bool edit );
+    wxRect CellToRect( int row, int col );
+    wxRect CellToRect( const wxGridCellCoords& coords )
+        { return CellToRect( coords.GetRow(), coords.GetCol() ); }

 
 

-    void     EnableTopEditControl( bool enable );
-    bool     IsTopEditControlEnabled()
-             { return (m_topEditCtrl && m_topEditCtrlEnabled); }
-    void     EnableCellEditControl( bool enable );
-    bool     IsCellEditControlEnabled()
-             { return (m_cellEditCtrl && m_cellEditCtrlEnabled); }
-    void     SetEditControlValue( const wxString& s = wxEmptyString );
-    
+    int  GetGridCursorRow() { return m_currentCellCoords.GetRow(); }
+    int  GetGridCursorCol() { return m_currentCellCoords.GetCol(); }

 
 

-    // ------ grid dimensions
+    // check to see if a cell is either wholly visible (the default arg) or
+    // at least partially visible in the grid window

     //
     //

-    int      GetNumberRows() { return  m_numRows; }
-    int      GetNumberCols() { return  m_numCols; }
-    int      GetNumberVisibleRows() { return m_wholeRowsVisible; }
-    int      GetNumberVisibleCols() { return m_wholeColsVisible; }
+    bool IsVisible( int row, int col, bool wholeCellVisible = TRUE );
+    bool IsVisible( const wxGridCellCoords& coords, bool wholeCellVisible = TRUE )
+        { return IsVisible( coords.GetRow(), coords.GetCol(), wholeCellVisible ); }
+    void MakeCellVisible( int row, int col );
+    void MakeCellVisible( const wxGridCellCoords& coords )
+        { MakeCellVisible( coords.GetRow(), coords.GetCol() ); }

 
 

-    
-    // ------
-    // Code that does a lot of grid modification can be enclosed
-    // between BeginBatch() and EndBatch() calls to avoid screen
-    // flicker
+
+    // ------ grid cursor movement functions

     //
     //

-    void     BeginBatch() { m_batchCount++; }
-    void     EndBatch() { if ( m_batchCount > 0 ) m_batchCount--; }
-    int      GetBatchCount() { return m_batchCount; }
+    void SetGridCursor( int row, int col )
+        { SetCurrentCell( wxGridCellCoords(row, col) ); }
+
+    bool MoveCursorUp();
+    bool MoveCursorDown();
+    bool MoveCursorLeft();
+    bool MoveCursorRight();
+    bool MovePageDown();
+    bool MovePageUp();
+    bool MoveCursorUpBlock();
+    bool MoveCursorDownBlock();
+    bool MoveCursorLeftBlock();
+    bool MoveCursorRightBlock();
+

 
 

-    

     // ------ label and gridline formatting
     //
     int      GetDefaultRowLabelSize() { return WXGRID_DEFAULT_ROW_LABEL_WIDTH; }
     int      GetRowLabelSize() { return m_rowLabelWidth; }
     // ------ label and gridline formatting
     //
     int      GetDefaultRowLabelSize() { return WXGRID_DEFAULT_ROW_LABEL_WIDTH; }
     int      GetRowLabelSize() { return m_rowLabelWidth; }

-    int      GetDefaultColLabelSize() { return WXGRID_DEFAULT_COL_LABEL_HEIGHT; }    
+    int      GetDefaultColLabelSize() { return WXGRID_DEFAULT_COL_LABEL_HEIGHT; }

     int      GetColLabelSize() { return m_colLabelHeight; }
     wxColour GetLabelBackgroundColour() { return m_labelBackgroundColour; }
     wxColour GetLabelTextColour() { return m_labelTextColour; }
     int      GetColLabelSize() { return m_colLabelHeight; }
     wxColour GetLabelBackgroundColour() { return m_labelBackgroundColour; }
     wxColour GetLabelTextColour() { return m_labelTextColour; }


@@ -587,10 +777,13 @@ class wxGrid : public wxPanel
     void     SetColLabelValue( int col, const wxString& );
     void     SetGridLineColour( const wxColour& );
 
     void     SetColLabelValue( int col, const wxString& );
     void     SetGridLineColour( const wxColour& );
 

+    // this sets the specified attribute for all cells in this row/col
+    void     SetRowAttr(int row, wxGridCellAttr *attr);
+    void     SetColAttr(int col, wxGridCellAttr *attr);
+

     void     EnableGridLines( bool enable = TRUE );
     bool     GridLinesEnabled() { return m_gridLinesEnabled; }
 
     void     EnableGridLines( bool enable = TRUE );
     bool     GridLinesEnabled() { return m_gridLinesEnabled; }
 

-    

     // ------ row and col formatting
     //
     int      GetDefaultRowSize();
     // ------ row and col formatting
     //
     int      GetDefaultRowSize();


@@ -601,26 +794,32 @@ class wxGrid : public wxPanel
     wxColour GetCellBackgroundColour( int row, int col );
     wxColour GetDefaultCellTextColour();
     wxColour GetCellTextColour( int row, int col );
     wxColour GetCellBackgroundColour( int row, int col );
     wxColour GetDefaultCellTextColour();
     wxColour GetCellTextColour( int row, int col );

-    wxColour GetCellHighlightColour();

     wxFont   GetDefaultCellFont();
     wxFont   GetCellFont( int row, int col );
     void     GetDefaultCellAlignment( int *horiz, int *vert );
     void     GetCellAlignment( int row, int col, int *horiz, int *vert );
     wxFont   GetDefaultCellFont();
     wxFont   GetCellFont( int row, int col );
     void     GetDefaultCellAlignment( int *horiz, int *vert );
     void     GetCellAlignment( int row, int col, int *horiz, int *vert );

-    
+

     void     SetDefaultRowSize( int height, bool resizeExistingRows = FALSE );
     void     SetRowSize( int row, int height );
     void     SetDefaultColSize( int width, bool resizeExistingCols = FALSE );
     void     SetDefaultRowSize( int height, bool resizeExistingRows = FALSE );
     void     SetRowSize( int row, int height );
     void     SetDefaultColSize( int width, bool resizeExistingCols = FALSE );

+

     void     SetColSize( int col, int width );
     void     SetDefaultCellBackgroundColour( const wxColour& );
     void     SetCellBackgroundColour( int row, int col, const wxColour& );
     void     SetDefaultCellTextColour( const wxColour& );
     void     SetColSize( int col, int width );
     void     SetDefaultCellBackgroundColour( const wxColour& );
     void     SetCellBackgroundColour( int row, int col, const wxColour& );
     void     SetDefaultCellTextColour( const wxColour& );

+

     void     SetCellTextColour( int row, int col, const wxColour& );
     void     SetCellTextColour( int row, int col, const wxColour& );

-    void     SetCellHighlightColour( const wxColour& );

     void     SetDefaultCellFont( const wxFont& );
     void     SetCellFont( int row, int col, const wxFont& );
     void     SetDefaultCellAlignment( int horiz, int vert );
     void     SetCellAlignment( int row, int col, int horiz, int vert );
 
     void     SetDefaultCellFont( const wxFont& );
     void     SetCellFont( int row, int col, const wxFont& );
     void     SetDefaultCellAlignment( int horiz, int vert );
     void     SetCellAlignment( int row, int col, int horiz, int vert );
 

+    // takes ownership of the pointer
+    void SetDefaultRenderer(wxGridCellRenderer *renderer);
+    void SetCellRenderer(int row, int col, wxGridCellRenderer *renderer);
+    wxGridCellRenderer *GetDefaultRenderer() const;
+    wxGridCellRenderer* GetCellRenderer(int row, int col);
+

 
     // ------ cell value accessors
     //
 
     // ------ cell value accessors
     //


@@ -638,43 +837,18 @@ class wxGrid : public wxPanel
 
     wxString GetCellValue( const wxGridCellCoords& coords )
         { return GetCellValue( coords.GetRow(), coords.GetCol() ); }
 
     wxString GetCellValue( const wxGridCellCoords& coords )
         { return GetCellValue( coords.GetRow(), coords.GetCol() ); }

-        
+

     void SetCellValue( int row, int col, const wxString& s );
     void SetCellValue( const wxGridCellCoords& coords, const wxString& s )
         { SetCellValue( coords.GetRow(), coords.GetCol(), s ); }
     void SetCellValue( int row, int col, const wxString& s );
     void SetCellValue( const wxGridCellCoords& coords, const wxString& s )
         { SetCellValue( coords.GetRow(), coords.GetCol(), s ); }

-            
-
-    // ------ interaction with data model
-    //
-    bool ProcessTableMessage( wxGridTableMessage& );
-    
-

 
 

-    // ------ grid location functions
-    //
-    
-    int  GetGridCursorRow() { return m_currentCellCoords.GetRow(); }
-    int  GetGridCursorCol() { return m_currentCellCoords.GetCol(); }
-    int  GetHorizontalScrollPos() { return m_scrollPosX; }
-    int  GetVerticalScrollPos() { return m_scrollPosY; }
-    
-    bool IsVisible( const wxGridCellCoords& );
-    void MakeCellVisible( int row, int col );
-    void MakeCellVisible( const wxGridCellCoords& coords )
-        { MakeCellVisible( coords.GetRow(), coords.GetCol() ); }
-                          
-    void SetGridCursor( int row, int col )
-        { SelectCell( wxGridCellCoords(row, col) ); }
-
-    void SetHorizontalScrollPos( int leftMostCol );
-    void SetVerticalScrollPos( int topMostRow );

 
 
     // ------ selections of blocks of cells
     //
     void SelectRow( int row, bool addToSelected = FALSE );
     void SelectCol( int col, bool addToSelected = FALSE );
 
 
     // ------ selections of blocks of cells
     //
     void SelectRow( int row, bool addToSelected = FALSE );
     void SelectCol( int col, bool addToSelected = FALSE );

-    
+

     void SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol );
 
     void SelectBlock( const wxGridCellCoords& topLeft,
     void SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol );
 
     void SelectBlock( const wxGridCellCoords& topLeft,


@@ -683,7 +857,7 @@ class wxGrid : public wxPanel
                        bottomRight.GetRow(), bottomRight.GetCol() ); }
 
     void SelectAll();
                        bottomRight.GetRow(), bottomRight.GetCol() ); }
 
     void SelectAll();

-    
+

     bool IsSelection()
         { return ( m_selectedTopLeft != wxGridNoCellCoords &&
                    m_selectedBottomRight != wxGridNoCellCoords );
     bool IsSelection()
         { return ( m_selectedTopLeft != wxGridNoCellCoords &&
                    m_selectedBottomRight != wxGridNoCellCoords );


@@ -712,10 +886,33 @@ class wxGrid : public wxPanel
             *rightCol  = m_selectedBottomRight.GetCol();
         }
 
             *rightCol  = m_selectedBottomRight.GetCol();
         }
 

-    // get coordinates of selected block edges for repainting etc.
+
+    // This function returns the rectangle that encloses the block of cells
+    // limited by TopLeft and BottomRight cell in device coords and clipped
+    //  to the client size of the grid window.

     //
     //

-    wxRect SelectionToRect();
-    
+    wxRect BlockToDeviceRect( const wxGridCellCoords & topLeft,
+                              const wxGridCellCoords & bottomRight );
+
+    // This function returns the rectangle that encloses the selected cells
+    // in device coords and clipped to the client size of the grid window.
+    //
+    wxRect SelectionToDeviceRect()
+        {
+            return BlockToDeviceRect( m_selectedTopLeft,
+                                      m_selectedBottomRight );
+        }
+
+    // Access or update the selection fore/back colours
+    wxColour GetSelectionBackground() const
+        { return m_selectionBackground; }
+    wxColour GetSelectionForeground() const
+        { return m_selectionForeground; }
+
+    void SetSelectionBackground(const wxColour& c) { m_selectionBackground = c; }
+    void SetSelectionForeground(const wxColour& c) { m_selectionForeground = c; }
+
+

 
     // ------ For compatibility with previous wxGrid only...
     //
 
     // ------ For compatibility with previous wxGrid only...
     //


@@ -730,16 +927,13 @@ class wxGrid : public wxPanel
             int x = -1, int y = -1, int w = -1, int h = -1,
             long style = 0,
             const wxString& name = wxPanelNameStr )
             int x = -1, int y = -1, int w = -1, int h = -1,
             long style = 0,
             const wxString& name = wxPanelNameStr )

-        : wxPanel( parent, -1, wxPoint(x,y), wxSize(w,h), style, name )
-        { 
+        : wxScrolledWindow( parent, -1, wxPoint(x,y), wxSize(w,h), style, name )
+        {

             Create();
             Create();

-        }    
+        }

 
     void SetCellValue( const wxString& val, int row, int col )
         { SetCellValue( row, col, val ); }
 
     void SetCellValue( const wxString& val, int row, int col )
         { SetCellValue( row, col, val ); }

-    
-    void AdjustScrollbars()
-        { CalcDimensions(); }

 
     void UpdateDimensions()
         { CalcDimensions(); }
 
     void UpdateDimensions()
         { CalcDimensions(); }


@@ -748,29 +942,30 @@ class wxGrid : public wxPanel
     int GetCols() { return GetNumberCols(); }
     int GetCursorRow() { return GetGridCursorRow(); }
     int GetCursorColumn() { return GetGridCursorCol(); }
     int GetCols() { return GetNumberCols(); }
     int GetCursorRow() { return GetGridCursorRow(); }
     int GetCursorColumn() { return GetGridCursorCol(); }

-    int GetScrollPosX() { return GetHorizontalScrollPos(); }
-    int GetScrollPosY() { return GetVerticalScrollPos(); }
-    
-    void SetScrollX( int x ) { SetHorizontalScrollPos( x ); }
-    void SetScrollY( int y ) { SetVerticalScrollPos( y ); }
+
+    int GetScrollPosX() { return 0; }
+    int GetScrollPosY() { return 0; }
+
+    void SetScrollX( int x ) { }
+    void SetScrollY( int y ) { }

 
     void SetColumnWidth( int col, int width )
         { SetColSize( col, width ); }
 
     void SetColumnWidth( int col, int width )
         { SetColSize( col, width ); }

-        
+

     int GetColumnWidth( int col )
         { return GetColSize( col ); }
     int GetColumnWidth( int col )
         { return GetColSize( col ); }

-        
+

     void SetRowHeight( int row, int height )
         { SetRowSize( row, height ); }
     void SetRowHeight( int row, int height )
         { SetRowSize( row, height ); }

-        
+

     int GetRowHeight( int row )
         { return GetRowSize( row ); }
     int GetRowHeight( int row )
         { return GetRowSize( row ); }

-        
-    int GetViewHeight()
-        { return m_wholeRowsVisible; }
-    
-    int GetViewWidth()
-        { return m_wholeColsVisible; }
+
+    int GetViewHeight() // returned num whole rows visible
+        { return 0; }
+
+    int GetViewWidth() // returned num whole cols visible
+        { return 0; }

 
     void SetLabelSize( int orientation, int sz )
         {
 
     void SetLabelSize( int orientation, int sz )
         {


@@ -796,7 +991,7 @@ class wxGrid : public wxPanel
                 SetRowLabelAlignment( align, -1 );
         }
 
                 SetRowLabelAlignment( align, -1 );
         }
 

-    int GetLabelAlignment( int orientation, int align )
+    int GetLabelAlignment( int orientation, int WXUNUSED(align) )

         {
             int h, v;
             if ( orientation == wxHORIZONTAL )
         {
             int h, v;
             if ( orientation == wxHORIZONTAL )


@@ -818,7 +1013,7 @@ class wxGrid : public wxPanel
             else
                 SetRowLabelValue( pos, val );
         }
             else
                 SetRowLabelValue( pos, val );
         }

-    
+

     wxString GetLabelValue( int orientation, int pos)
         {
             if ( orientation == wxHORIZONTAL )
     wxString GetLabelValue( int orientation, int pos)
         {
             if ( orientation == wxHORIZONTAL )


@@ -827,34 +1022,35 @@ class wxGrid : public wxPanel
                 return GetRowLabelValue( pos );
         }
 
                 return GetRowLabelValue( pos );
         }
 

-    wxFont GetCellTextFont() const 
-        { return m_defaultCellFont; }
-        
-    wxFont GetCellTextFont(int row, int col) const
-        { return m_defaultCellFont; }
-        
+    wxFont GetCellTextFont() const
+        { return m_defaultCellAttr->GetFont(); }
+
+    wxFont GetCellTextFont(int WXUNUSED(row), int WXUNUSED(col)) const
+        { return m_defaultCellAttr->GetFont(); }
+

     void SetCellTextFont(const wxFont& fnt)
         { SetDefaultCellFont( fnt ); }
     void SetCellTextFont(const wxFont& fnt)
         { SetDefaultCellFont( fnt ); }

-        
+

     void SetCellTextFont(const wxFont& fnt, int row, int col)
         { SetCellFont( row, col, fnt ); }
     void SetCellTextFont(const wxFont& fnt, int row, int col)
         { SetCellFont( row, col, fnt ); }

-        
+

     void SetCellTextColour(const wxColour& val, int row, int col)
         { SetCellTextColour( row, col, val ); }
     void SetCellTextColour(const wxColour& val, int row, int col)
         { SetCellTextColour( row, col, val ); }

-        
+

     void SetCellTextColour(const wxColour& col)
         { SetDefaultCellTextColour( col ); }
     void SetCellTextColour(const wxColour& col)
         { SetDefaultCellTextColour( col ); }

-        
+

     void SetCellBackgroundColour(const wxColour& col)
         { SetDefaultCellBackgroundColour( col ); }
     void SetCellBackgroundColour(const wxColour& col)
         { SetDefaultCellBackgroundColour( col ); }

-        
+

     void SetCellBackgroundColour(const wxColour& colour, int row, int col)
         { SetCellBackgroundColour( row, col, colour ); }
     void SetCellBackgroundColour(const wxColour& colour, int row, int col)
         { SetCellBackgroundColour( row, col, colour ); }

-     
+

     bool GetEditable() { return IsEditable(); }
     void SetEditable( bool edit = TRUE ) { EnableEditing( edit ); }
     bool GetEditInPlace() { return IsCellEditControlEnabled(); }
     bool GetEditable() { return IsEditable(); }
     void SetEditable( bool edit = TRUE ) { EnableEditing( edit ); }
     bool GetEditInPlace() { return IsCellEditControlEnabled(); }

-    void SetEditInPlace(bool edit = TRUE) { EnableCellEditControl( edit ); }
+
+    void SetEditInPlace(bool edit = TRUE) { }

 
     void SetCellAlignment( int align, int row, int col)
     { SetCellAlignment(row, col, align, wxCENTER); }
 
     void SetCellAlignment( int align, int row, int col)
     { SetCellAlignment(row, col, align, wxCENTER); }


@@ -864,23 +1060,190 @@ class wxGrid : public wxPanel
     void SetDividerPen(const wxPen& WXUNUSED(pen)) { }
     wxPen& GetDividerPen() const { return wxNullPen; }
     void OnActivate(bool WXUNUSED(active)) {}
     void SetDividerPen(const wxPen& WXUNUSED(pen)) { }
     wxPen& GetDividerPen() const { return wxNullPen; }
     void OnActivate(bool WXUNUSED(active)) {}

-            
+

     // ******** End of compatibility functions **********
 
     // ******** End of compatibility functions **********
 

-        
+
+

     // ------ control IDs
     // ------ control IDs

-    enum { wxGRID_HORIZSCROLL = 2000,
-           wxGRID_VERTSCROLL,
-           wxGRID_CELLCTRL,
+    enum { wxGRID_CELLCTRL = 2000,

            wxGRID_TOPCTRL };
 
     // ------ control types
            wxGRID_TOPCTRL };
 
     // ------ control types

-    enum { wxGRID_TEXTCTRL = 100,
+    enum { wxGRID_TEXTCTRL = 2100,

            wxGRID_CHECKBOX,
            wxGRID_CHOICE,
            wxGRID_COMBOBOX };
 
            wxGRID_CHECKBOX,
            wxGRID_CHOICE,
            wxGRID_COMBOBOX };
 

-    
+protected:
+    bool m_created;
+    bool m_displayed;
+
+    wxGridWindow             *m_gridWin;
+    wxGridRowLabelWindow     *m_rowLabelWin;
+    wxGridColLabelWindow     *m_colLabelWin;
+    wxGridCornerLabelWindow  *m_cornerLabelWin;
+
+    wxGridTableBase          *m_table;
+    bool                      m_ownTable;
+
+    int m_left;
+    int m_top;
+    int m_right;
+    int m_bottom;
+
+    int m_numRows;
+    int m_numCols;
+
+    wxGridCellCoords m_currentCellCoords;
+
+    wxGridCellCoords m_selectedTopLeft;
+    wxGridCellCoords m_selectedBottomRight;
+    wxColour    m_selectionBackground;
+    wxColour    m_selectionForeground;
+
+    int        m_defaultRowHeight;
+    wxArrayInt m_rowHeights;
+    wxArrayInt m_rowBottoms;
+
+    int        m_defaultColWidth;
+    wxArrayInt m_colWidths;
+    wxArrayInt m_colRights;
+
+    int m_rowLabelWidth;
+    int m_colLabelHeight;
+
+    wxColour   m_labelBackgroundColour;
+    wxColour   m_labelTextColour;
+    wxFont     m_labelFont;
+
+    int        m_rowLabelHorizAlign;
+    int        m_rowLabelVertAlign;
+    int        m_colLabelHorizAlign;
+    int        m_colLabelVertAlign;
+
+    bool       m_defaultRowLabelValues;
+    bool       m_defaultColLabelValues;
+
+    wxColour   m_gridLineColour;
+    bool       m_gridLinesEnabled;
+
+
+    // do we have some place to store attributes in?
+    bool CanHaveAttributes();
+
+    // returns the attribute we may modify in place: a new one if this cell
+    // doesn't have any yet or the existing one if it does
+    //
+    // DecRef() must be called on the returned pointer, as usual
+    wxGridCellAttr *GetOrCreateCellAttr(int row, int col) const;
+
+    // cell attribute cache (currently we only cache 1, may be will do
+    // more/better later)
+    struct CachedAttr
+    {
+        int             row, col;
+        wxGridCellAttr *attr;
+    } m_attrCache;
+
+    // invalidates the attribute cache
+    void ClearAttrCache();
+
+    // adds an attribute to cache
+    void CacheAttr(int row, int col, wxGridCellAttr *attr) const;
+
+    // looks for an attr in cache, returns TRUE if found
+    bool LookupAttr(int row, int col, wxGridCellAttr **attr) const;
+
+    // looks for the attr in cache, if not found asks the table and caches the
+    // result
+    wxGridCellAttr *GetCellAttr(int row, int col) const;
+
+    // the default cell attr object for cells that don't have their own
+    wxGridCellAttr*     m_defaultCellAttr;
+
+
+    wxGridCellCoordsArray  m_cellsExposed;
+    wxArrayInt             m_rowsExposed;
+    wxArrayInt             m_colsExposed;
+    wxArrayInt             m_rowLabelsExposed;
+    wxArrayInt             m_colLabelsExposed;
+
+    bool m_inOnKeyDown;
+    int  m_batchCount;
+
+    enum CursorMode
+    {
+        WXGRID_CURSOR_SELECT_CELL,
+        WXGRID_CURSOR_RESIZE_ROW,
+        WXGRID_CURSOR_RESIZE_COL,
+        WXGRID_CURSOR_SELECT_ROW,
+        WXGRID_CURSOR_SELECT_COL
+    };
+
+    // this method not only sets m_cursorMode but also sets the correct cursor
+    // for the given mode and, if captureMouse is not FALSE releases the mouse
+    // if it was captured and captures it if it must be captured
+    //
+    // for this to work, you should always use it and not set m_cursorMode
+    // directly!
+    void ChangeCursorMode(CursorMode mode,
+                          wxWindow *win = (wxWindow *)NULL,
+                          bool captureMouse = TRUE);
+
+    wxWindow *m_winCapture;     // the window which captured the mouse
+    CursorMode m_cursorMode;
+
+    int  m_dragLastPos;
+    int  m_dragRowOrCol;
+    bool m_isDragging;
+
+    wxTimer        *m_editTimer;
+
+    wxGridCellCoords m_selectionStart;
+
+    wxCursor m_rowResizeCursor;
+    wxCursor m_colResizeCursor;
+
+    bool       m_editable;  // applies to whole grid
+    int        m_editCtrlType;  // for current cell
+    wxWindow*  m_cellEditCtrl;
+    bool       m_cellEditCtrlEnabled;
+
+
+    void Create();
+    void Init();
+    void CalcDimensions();
+    void CalcWindowSizes();
+    bool Redimension( wxGridTableMessage& );
+
+
+    bool SendEvent( const wxEventType,
+                    int row, int col,
+                    wxMouseEvent& );
+
+    bool SendEvent( const wxEventType,
+                    int row, int col );
+
+
+    void OnPaint( wxPaintEvent& );
+    void OnSize( wxSizeEvent& );
+    void OnKeyDown( wxKeyEvent& );
+    void OnEraseBackground( wxEraseEvent& );
+
+
+    void SetCurrentCell( const wxGridCellCoords& coords );
+    void SetCurrentCell( int row, int col )
+        { SetCurrentCell( wxGridCellCoords(row, col) ); }
+
+
+    // ------ functions to get/send data (see also public functions)
+    //
+    bool GetModelValues();
+    bool SetModelValues();
+
+
+    DECLARE_DYNAMIC_CLASS( wxGrid )

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -894,19 +1257,7 @@ class wxGrid : public wxPanel
 
 class WXDLLEXPORT wxGridEvent : public wxNotifyEvent
 {
 
 class WXDLLEXPORT wxGridEvent : public wxNotifyEvent
 {

-    DECLARE_DYNAMIC_CLASS(wxGridEvent)
-
-  private:
-    int         m_row;
-    int         m_col;
-    int         m_x;
-    int         m_y;
-    bool        m_control;
-    bool        m_meta;
-    bool        m_shift;
-    bool        m_alt;
-        
-  public:
+public:

     wxGridEvent()
         : wxNotifyEvent(), m_row(-1), m_col(-1), m_x(-1), m_y(-1),
         m_control(0), m_meta(0), m_shift(0), m_alt(0)
     wxGridEvent()
         : wxNotifyEvent(), m_row(-1), m_col(-1), m_x(-1), m_y(-1),
         m_control(0), m_meta(0), m_shift(0), m_alt(0)


@@ -924,23 +1275,24 @@ class WXDLLEXPORT wxGridEvent : public wxNotifyEvent
     bool        MetaDown() { return m_meta; }
     bool        ShiftDown() { return m_shift; }
     bool        AltDown() { return m_alt; }
     bool        MetaDown() { return m_meta; }
     bool        ShiftDown() { return m_shift; }
     bool        AltDown() { return m_alt; }

-};
-
-
-class WXDLLEXPORT wxGridSizeEvent : public wxNotifyEvent
-{
-    DECLARE_DYNAMIC_CLASS(wxGridSizeEvent)

 
 

-  private:
-    int         m_rowOrCol;
+protected:
+    int         m_row;
+    int         m_col;

     int         m_x;
     int         m_y;
     bool        m_control;
     bool        m_meta;
     bool        m_shift;
     bool        m_alt;
     int         m_x;
     int         m_y;
     bool        m_control;
     bool        m_meta;
     bool        m_shift;
     bool        m_alt;

-        
-  public:
+
+    DECLARE_DYNAMIC_CLASS(wxGridEvent)
+};
+
+
+class WXDLLEXPORT wxGridSizeEvent : public wxNotifyEvent
+{
+public:

     wxGridSizeEvent()
         : wxNotifyEvent(), m_rowOrCol(-1), m_x(-1), m_y(-1),
         m_control(0), m_meta(0), m_shift(0), m_alt(0)
     wxGridSizeEvent()
         : wxNotifyEvent(), m_rowOrCol(-1), m_x(-1), m_y(-1),
         m_control(0), m_meta(0), m_shift(0), m_alt(0)


@@ -957,38 +1309,39 @@ class WXDLLEXPORT wxGridSizeEvent : public wxNotifyEvent
     bool        MetaDown() { return m_meta; }
     bool        ShiftDown() { return m_shift; }
     bool        AltDown() { return m_alt; }
     bool        MetaDown() { return m_meta; }
     bool        ShiftDown() { return m_shift; }
     bool        AltDown() { return m_alt; }

+
+protected:
+    int         m_rowOrCol;
+    int         m_x;
+    int         m_y;
+    bool        m_control;
+    bool        m_meta;
+    bool        m_shift;
+    bool        m_alt;
+
+    DECLARE_DYNAMIC_CLASS(wxGridSizeEvent)

 };
 
 
 class WXDLLEXPORT wxGridRangeSelectEvent : public wxNotifyEvent
 {
 };
 
 
 class WXDLLEXPORT wxGridRangeSelectEvent : public wxNotifyEvent
 {

-    DECLARE_DYNAMIC_CLASS(wxGridRangeSelectEvent)
-
-  private:
-    wxGridCellCoords  m_topLeft;
-    wxGridCellCoords  m_bottomRight;
-    bool              m_control;
-    bool              m_meta;
-    bool              m_shift;
-    bool              m_alt;
-
-  public:
+public:

     wxGridRangeSelectEvent()
     wxGridRangeSelectEvent()

-       : wxNotifyEvent()
-       {
-           m_topLeft     = wxGridNoCellCoords;
-           m_bottomRight = wxGridNoCellCoords;
-           m_control     = FALSE;
-           m_meta        = FALSE;
-           m_shift       = FALSE;
-           m_alt         = FALSE;
-       }
+        : wxNotifyEvent()
+        {
+            m_topLeft     = wxGridNoCellCoords;
+            m_bottomRight = wxGridNoCellCoords;
+            m_control     = FALSE;
+            m_meta        = FALSE;
+            m_shift       = FALSE;
+            m_alt         = FALSE;
+        }

 
     wxGridRangeSelectEvent(int id, wxEventType type, wxObject* obj,
 
     wxGridRangeSelectEvent(int id, wxEventType type, wxObject* obj,

-                          const wxGridCellCoords& topLeft,
-                          const wxGridCellCoords& bottomRight,
-                          bool control=FALSE, bool shift=FALSE,
-                          bool alt=FALSE, bool meta=FALSE);
+                           const wxGridCellCoords& topLeft,
+                           const wxGridCellCoords& bottomRight,
+                           bool control=FALSE, bool shift=FALSE,
+                           bool alt=FALSE, bool meta=FALSE);

 
     wxGridCellCoords GetTopLeftCoords() { return m_topLeft; }
     wxGridCellCoords GetBottomRightCoords() { return m_bottomRight; }
 
     wxGridCellCoords GetTopLeftCoords() { return m_topLeft; }
     wxGridCellCoords GetBottomRightCoords() { return m_bottomRight; }


@@ -1000,6 +1353,16 @@ class WXDLLEXPORT wxGridRangeSelectEvent : public wxNotifyEvent
     bool        MetaDown()     { return m_meta; }
     bool        ShiftDown()    { return m_shift; }
     bool        AltDown()      { return m_alt; }
     bool        MetaDown()     { return m_meta; }
     bool        ShiftDown()    { return m_shift; }
     bool        AltDown()      { return m_alt; }

+
+protected:
+    wxGridCellCoords  m_topLeft;
+    wxGridCellCoords  m_bottomRight;
+    bool              m_control;
+    bool              m_meta;
+    bool              m_shift;
+    bool              m_alt;
+
+    DECLARE_DYNAMIC_CLASS(wxGridRangeSelectEvent)

 };
 
 
 };
 
 


@@ -1033,7 +1396,7 @@ typedef void (wxEvtHandler::*wxGridRangeSelectEventFunction)(wxGridRangeSelectEv
 #define EVT_GRID_ROW_SIZE(fn)            { EVT_GRID_ROW_SIZE,           -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridSizeEventFunction) &fn, NULL },
 #define EVT_GRID_COL_SIZE(fn)            { EVT_GRID_COL_SIZE,           -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridSizeEventFunction) &fn, NULL },
 #define EVT_GRID_RANGE_SELECT(fn)        { EVT_GRID_RANGE_SELECT,       -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridRangeSelectEventFunction) &fn, NULL },
 #define EVT_GRID_ROW_SIZE(fn)            { EVT_GRID_ROW_SIZE,           -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridSizeEventFunction) &fn, NULL },
 #define EVT_GRID_COL_SIZE(fn)            { EVT_GRID_COL_SIZE,           -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridSizeEventFunction) &fn, NULL },
 #define EVT_GRID_RANGE_SELECT(fn)        { EVT_GRID_RANGE_SELECT,       -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridRangeSelectEventFunction) &fn, NULL },

-#define EVT_GRID_CELL_CHANGE(fn)         { EVT_GRID_CELL_CHANGE,        -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL }, 
+#define EVT_GRID_CELL_CHANGE(fn)         { EVT_GRID_CELL_CHANGE,        -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },

 #define EVT_GRID_SELECT_CELL(fn)         { EVT_GRID_SELECT_CELL,        -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
 
 
 #define EVT_GRID_SELECT_CELL(fn)         { EVT_GRID_SELECT_CELL,        -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
 
 


@@ -1052,3 +1415,4 @@ const wxEventType EVT_GRID_CHANGE_SEL_LABEL = wxEVT_FIRST + 1578;
 #endif  // #ifndef __WXGRID_H__
 
 #endif  // ifndef wxUSE_NEW_GRID
 #endif  // #ifndef __WXGRID_H__
 
 #endif  // ifndef wxUSE_NEW_GRID

+