Added BMP files for wxPlotWindow,

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

diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index 84536996ab316d7978573c0d113f8544943fb70d..2a316560875a1564b16fbbeef5933f7618906834 100644 (file)
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -49,12 +49,101 @@
 #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 wxGridCellAttrProviderData;
+class WXDLLEXPORT wxGridRowLabelWindow;
+class WXDLLEXPORT wxGridColLabelWindow;
+class WXDLLEXPORT wxGridCornerLabelWindow;
+class WXDLLEXPORT wxGridWindow;

 class WXDLLEXPORT wxGrid;
 
 class WXDLLEXPORT wxGrid;
 

+// ----------------------------------------------------------------------------
+// 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()
+    {
+        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)
+    {
+        SetAlignment(hAlign, vAlign);
+    }
+
+    // default copy ctor ok
+
+    // 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;
+    }
+
+    // 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; }
+
+    const wxColour& GetTextColour() const { return m_colText; }
+    const wxColour& GetBackgroundColour() const { return m_colBack; }
+    const wxFont& GetFont() const { return m_font; }
+    void GetAlignment(int *hAlign, int *vAlign)
+    {
+        if ( hAlign ) *hAlign = m_hAlign;
+        if ( vAlign ) *vAlign = m_vAlign;
+    }
+
+private:
+    wxColour m_colText,
+             m_colBack;
+    wxFont   m_font;
+    int      m_hAlign,
+             m_vAlign;
+};
+
+// ----------------------------------------------------------------------------
+// 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
+
+class WXDLLEXPORT wxGridCellAttrProvider
+{
+public:
+    wxGridCellAttrProvider();
+    virtual ~wxGridCellAttrProvider();
+
+    virtual wxGridCellAttr *GetAttr(int row, int col) const;
+    virtual void SetAttr(const wxGridCellAttr *attr, int row, int col);
+
+private:
+    void InitData();
+
+    wxGridCellAttrProviderData *m_data;
+};

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


@@ -65,9 +154,7 @@ class WXDLLEXPORT wxGrid;
 
 class WXDLLEXPORT wxGridTableBase : public wxObject
 {
 
 class WXDLLEXPORT wxGridTableBase : public wxObject
 {

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

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


@@ -78,7 +165,7 @@ class WXDLLEXPORT 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; }


@@ -96,15 +183,39 @@ class WXDLLEXPORT wxGridTableBase : public wxObject
     virtual wxString GetColLabelValue( int col );
     virtual void SetRowLabelValue( int WXUNUSED(row), const wxString& ) {}
     virtual void SetColLabelValue( int WXUNUSED(col), const wxString& ) {}
     virtual wxString GetColLabelValue( int col );
     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 );
+
+    // takes ownership of the pointer
+    virtual void SetAttr(const wxGridCellAttr *attr, int row, 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,


@@ -117,12 +228,7 @@ enum wxGridTableRequest {
 
 class WXDLLEXPORT 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,


@@ -135,7 +241,13 @@ class WXDLLEXPORT 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;

 };
 
 
 };
 
 


@@ -156,15 +268,7 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxArrayString, wxGridStringArray);
 
 class WXDLLEXPORT 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();


@@ -176,7 +280,7 @@ class WXDLLEXPORT 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();


@@ -191,7 +295,16 @@ class WXDLLEXPORT 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 )
 };
 


@@ -205,10 +318,7 @@ class WXDLLEXPORT wxGridStringTable : public wxGridTableBase
 
 class WXDLLEXPORT 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; }
 


@@ -219,7 +329,7 @@ class WXDLLEXPORT 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 )


@@ -244,6 +354,10 @@ class WXDLLEXPORT wxGridCellCoords
     {
         return (m_row == -1 && m_col == -1 );
     }
     {
         return (m_row == -1 && m_col == -1 );
     }

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

 };
 
 
 };
 
 


@@ -259,22 +373,12 @@ 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
 
 class WXDLLEXPORT wxGridTextCtrl : public wxTextCtrl
 {
 // system in deference to wxPython
 
 class WXDLLEXPORT wxGridTextCtrl : public wxTextCtrl
 {

-    wxGrid *m_grid;
-    
-    // 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 *,
                     wxGrid *,
     wxGridTextCtrl() {}
     wxGridTextCtrl( wxWindow *,
                     wxGrid *,


@@ -287,221 +391,39 @@ class WXDLLEXPORT 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 WXDLLEXPORT wxGridRowLabelWindow : public wxWindow
-{
-    wxGrid   *m_owner;
-    
-    void OnPaint( wxPaintEvent& event );
-    void OnMouseEvent( wxMouseEvent& event );
-    void OnKeyDown( wxKeyEvent& event );
-
-public:
-    wxGridRowLabelWindow() {}
-    wxGridRowLabelWindow( wxGrid *parent, wxWindowID id, 
-                          const wxPoint &pos, const wxSize &size );
-   
-    DECLARE_DYNAMIC_CLASS(wxGridRowLabelWindow)
-    DECLARE_EVENT_TABLE()
-};
-
-
-class WXDLLEXPORT wxGridColLabelWindow : public wxWindow
-{
-    wxGrid   *m_owner;
-    
-    void OnPaint( wxPaintEvent &event );
-    void OnMouseEvent( wxMouseEvent& event );
-    void OnKeyDown( wxKeyEvent& event );
-
-public:
-    wxGridColLabelWindow() {}
-    wxGridColLabelWindow( wxGrid *parent, wxWindowID id, 
-                          const wxPoint &pos, const wxSize &size );
-   
-    DECLARE_DYNAMIC_CLASS(wxGridColLabelWindow)
-    DECLARE_EVENT_TABLE()
-};
-
-
-class WXDLLEXPORT wxGridCornerLabelWindow : public wxWindow
-{
-    wxGrid *m_owner;
-    
-    void OnMouseEvent( wxMouseEvent& event );
-    void OnKeyDown( wxKeyEvent& event );
-    
-  public:
-    wxGridCornerLabelWindow() {}
-    wxGridCornerLabelWindow( wxGrid *parent, wxWindowID id,
-                             const wxPoint &pos, const wxSize &size );
-
-    DECLARE_DYNAMIC_CLASS(wxGridCornerLabelWindow)
-    DECLARE_EVENT_TABLE()
-};

 
 

+private:
+    wxGrid *m_grid;

 
 

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

 
 

-class WXDLLEXPORT wxGridWindow : public wxPanel
-{
-    wxGrid                   *m_owner;
-    wxGridRowLabelWindow     *m_rowLabelWin;
-    wxGridColLabelWindow     *m_colLabelWin;
+    wxString startValue;

 
 

-    void OnPaint( wxPaintEvent &event );
-    void OnMouseEvent( wxMouseEvent& event );

     void OnKeyDown( wxKeyEvent& );
 
     void OnKeyDown( wxKeyEvent& );
 

-public:
-    wxGridWindow() {}
-    wxGridWindow( wxGrid *parent, 
-                  wxGridRowLabelWindow *rowLblWin,
-                  wxGridColLabelWindow *colLblWin,
-                  wxWindowID id, const wxPoint &pos, const wxSize &size );
-    ~wxGridWindow();
-
-    void ScrollWindow( int dx, int dy, const wxRect *rect );
-
-    DECLARE_DYNAMIC_CLASS(wxGridWindow)
+    DECLARE_DYNAMIC_CLASS( wxGridTextCtrl )

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

-
+// ----------------------------------------------------------------------------
+// wxGrid
+// ----------------------------------------------------------------------------

 
 class WXDLLEXPORT wxGrid : public wxScrolledWindow
 {
 
 class WXDLLEXPORT wxGrid : public wxScrolledWindow
 {

-  protected:
-    bool m_created;
-
-    wxGridWindow             *m_gridWin;
-    wxGridRowLabelWindow     *m_rowLabelWin;
-    wxGridColLabelWindow     *m_colLabelWin;
-    wxGridCornerLabelWindow  *m_cornerLabelWin;
-
-    wxBoxSizer               *m_mainSizer;
-    wxBoxSizer               *m_topSizer;
-    wxBoxSizer               *m_middleSizer;
-    
-    wxGridTableBase          *m_table;
-
-    int m_left;
-    int m_top;
-    int m_right;
-    int m_bottom;
-    
-    int m_numRows;
-    int m_numCols;
-
-    wxGridCellCoords m_currentCellCoords;
-    bool             m_currentCellHighlighted;
-
-    wxGridCellCoords m_selectedTopLeft;
-    wxGridCellCoords m_selectedBottomRight;
-        
-    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;
-
-    wxFont     m_defaultCellFont;
-    
-    wxGridCellCoordsArray  m_cellsExposed;    
-    wxArrayInt             m_rowsExposed;
-    wxArrayInt             m_colsExposed;
-    wxArrayInt             m_rowLabelsExposed;
-    wxArrayInt             m_colLabelsExposed;
-
-    bool m_inOnKeyDown;
-    int  m_batchCount;
-
-    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;
-
-    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;
-    
-
-    void Create();
-    void Init();
-    void CalcDimensions();
-    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 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();
-
-
-    ////////////////////// Public section ////////////////////
-    
-  public:
+public:

     wxGrid()
     wxGrid()

-        { Create(); }
-    
+        {
+            m_table          = (wxGridTableBase *) NULL;
+            m_gridWin        = (wxGridWindow *) NULL;
+            m_rowLabelWin    = (wxGridRowLabelWindow *) NULL;
+            m_colLabelWin    = (wxGridColLabelWindow *) NULL;
+            m_cornerLabelWin = (wxGridCornerLabelWindow *) NULL;
+            m_cellEditCtrl   = (wxWindow *) NULL;
+        }
+

     wxGrid( wxWindow *parent,
             wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,
     wxGrid( wxWindow *parent,
             wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,


@@ -509,33 +431,36 @@ class WXDLLEXPORT wxGrid : public wxScrolledWindow
             long style = 0,
             const wxString& name = wxPanelNameStr );
 
             long style = 0,
             const wxString& name = wxPanelNameStr );
 

-    ~wxGrid();    
+    ~wxGrid();

 
     bool CreateGrid( int numRows, int numCols );
 
 
     bool CreateGrid( int numRows, int numCols );
 

-    
+

     // ------ grid dimensions
     //
     int      GetNumberRows() { return  m_numRows; }
     int      GetNumberCols() { return  m_numCols; }
 
     // ------ grid dimensions
     //
     int      GetNumberRows() { return  m_numRows; }
     int      GetNumberCols() { return  m_numCols; }
 

-    
+

     // ------ display update functions
     //
     // ------ display update functions
     //

-    void CalcRowLabelsExposed( wxRegion& reg );    
-    void CalcColLabelsExposed( wxRegion& reg );    
-    void CalcCellsExposed( wxRegion& reg );    
+    void CalcRowLabelsExposed( wxRegion& reg );
+
+    void CalcColLabelsExposed( wxRegion& reg );
+    void CalcCellsExposed( wxRegion& reg );
+

 
 

-    

     // ------ event handlers
     //
     void ProcessRowLabelMouseEvent( wxMouseEvent& event );
     void ProcessColLabelMouseEvent( wxMouseEvent& event );
     void ProcessCornerLabelMouseEvent( wxMouseEvent& event );
     // ------ event handlers
     //
     void ProcessRowLabelMouseEvent( wxMouseEvent& event );
     void ProcessColLabelMouseEvent( wxMouseEvent& event );
     void ProcessCornerLabelMouseEvent( wxMouseEvent& event );

-    void ProcessGridCellMouseEvent( wxMouseEvent& event );  
+    void ProcessGridCellMouseEvent( wxMouseEvent& event );

     bool ProcessTableMessage( wxGridTableMessage& );
 
     bool ProcessTableMessage( wxGridTableMessage& );
 

-    
+    void DoEndDragResizeRow();
+    void DoEndDragResizeCol();
+

     wxGridTableBase * GetTable() const { return m_table; }
     void SetTable( wxGridTableBase *table ) { m_table = table; }
 
     wxGridTableBase * GetTable() const { return m_table; }
     void SetTable( wxGridTableBase *table ) { m_table = table; }
 


@@ -545,20 +470,21 @@ class WXDLLEXPORT wxGrid : public wxScrolledWindow
     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 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 );    
+    bool DeleteCols( int pos = 0, int numCols = 1, bool updateLabels=TRUE );

 
     void DrawGridCellArea( wxDC& dc );
     void DrawCellBorder( wxDC& dc, const wxGridCellCoords& );
 
     void DrawGridCellArea( wxDC& dc );
     void DrawCellBorder( wxDC& dc, const wxGridCellCoords& );

-    void DrawAllGridLines( wxDC& dc );  // TODO - delete this ?
+    void DrawAllGridLines( wxDC& dc, const wxRegion & reg );

     void DrawCell( wxDC& dc, const wxGridCellCoords& );
     void DrawCellBackground( wxDC& dc, const wxGridCellCoords& );
     void DrawCellValue( wxDC& dc, const wxGridCellCoords& );
     void DrawCell( wxDC& dc, const wxGridCellCoords& );
     void DrawCellBackground( wxDC& dc, const wxGridCellCoords& );
     void DrawCellValue( wxDC& dc, const wxGridCellCoords& );

-    
+

     void DrawRowLabels( wxDC& dc );
     void DrawRowLabel( wxDC& dc, int row );
     void DrawRowLabels( wxDC& dc );
     void DrawRowLabel( wxDC& dc, int row );

+

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

-    
+

 
     // ------ Cell text drawing functions
     //
 
     // ------ Cell text drawing functions
     //


@@ -570,11 +496,11 @@ class WXDLLEXPORT wxGrid : public wxScrolledWindow
     // 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 );

-    
+

 
     // ------
     // Code that does a lot of grid modification can be enclosed
 
     // ------
     // Code that does a lot of grid modification can be enclosed


@@ -591,24 +517,21 @@ class WXDLLEXPORT wxGrid : public wxScrolledWindow
     bool IsEditable() { return m_editable; }
     void EnableEditing( bool edit );
 
     bool IsEditable() { return m_editable; }
     void EnableEditing( bool edit );
 

+#if 0  // at the moment the cell edit control is always active

     void     EnableCellEditControl( bool enable );
     void     EnableCellEditControl( bool enable );

+#endif

 
     bool     IsCellEditControlEnabled()
              { return (m_cellEditCtrl && m_cellEditCtrlEnabled); }
 
 
     bool     IsCellEditControlEnabled()
              { return (m_cellEditCtrl && m_cellEditCtrlEnabled); }
 

-    void     EnableTopEditControl( bool enable );
-
-    bool     IsTopEditControlEnabled()
-             { return (m_topEditCtrl && m_topEditCtrlEnabled); }
-    

     void ShowCellEditControl();
     void HideCellEditControl();
     void SetEditControlValue( const wxString& s = wxEmptyString );
     void SaveEditControlValue();
 
     void ShowCellEditControl();
     void HideCellEditControl();
     void SetEditControlValue( const wxString& s = wxEmptyString );
     void SaveEditControlValue();
 

-    
+

     // ------ grid location functions
     // ------ grid location functions

-    //  Note that all of these functions work with the logical coordinates of 
+    //  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.
     //
     //  grid cells and labels so you will need to convert from device
     //  coordinates for mouse events etc.
     //


@@ -625,7 +548,7 @@ class WXDLLEXPORT wxGrid : public wxScrolledWindow
 
     int  GetGridCursorRow() { return m_currentCellCoords.GetRow(); }
     int  GetGridCursorCol() { return m_currentCellCoords.GetCol(); }
 
     int  GetGridCursorRow() { return m_currentCellCoords.GetRow(); }
     int  GetGridCursorCol() { return m_currentCellCoords.GetCol(); }

-    
+

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


@@ -636,9 +559,12 @@ class WXDLLEXPORT wxGrid : public wxScrolledWindow
     void MakeCellVisible( const wxGridCellCoords& coords )
         { MakeCellVisible( coords.GetRow(), coords.GetCol() ); }
 
     void MakeCellVisible( const wxGridCellCoords& coords )
         { MakeCellVisible( coords.GetRow(), coords.GetCol() ); }
 

-    
+

     // ------ grid cursor movement functions
     //
     // ------ grid cursor movement functions
     //

+    void SetGridCursor( int row, int col )
+        { SetCurrentCell( wxGridCellCoords(row, col) ); }
+

     bool MoveCursorUp();
     bool MoveCursorDown();
     bool MoveCursorLeft();
     bool MoveCursorUp();
     bool MoveCursorDown();
     bool MoveCursorLeft();


@@ -650,12 +576,12 @@ class WXDLLEXPORT wxGrid : public wxScrolledWindow
     bool MoveCursorLeftBlock();
     bool MoveCursorRightBlock();
 
     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; }


@@ -691,21 +617,21 @@ class WXDLLEXPORT wxGrid : public wxScrolledWindow
     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     SetDefaultCellFont( const wxFont& );
     void     SetCellFont( int row, int col, const wxFont& );
     void     SetDefaultCellAlignment( int horiz, int vert );


@@ -728,18 +654,18 @@ class WXDLLEXPORT wxGrid : public wxScrolledWindow
 
     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 ); }
 

-            
+

 
     // ------ 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,


@@ -748,7 +674,7 @@ class WXDLLEXPORT wxGrid : public wxScrolledWindow
                        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 );


@@ -777,12 +703,23 @@ class WXDLLEXPORT wxGrid : public wxScrolledWindow
             *rightCol  = m_selectedBottomRight.GetCol();
         }
 
             *rightCol  = m_selectedBottomRight.GetCol();
         }
 

+
+    // 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 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.
     //
     // 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();
-    
-    
+    wxRect SelectionToDeviceRect()
+        {
+            return BlockToDeviceRect( m_selectedTopLeft,
+                                      m_selectedBottomRight );
+        }
+

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


@@ -798,13 +735,13 @@ class WXDLLEXPORT wxGrid : public wxScrolledWindow
             long style = 0,
             const wxString& name = wxPanelNameStr )
         : wxScrolledWindow( parent, -1, wxPoint(x,y), wxSize(w,h), style, name )
             long style = 0,
             const wxString& name = wxPanelNameStr )
         : 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 UpdateDimensions()
         { CalcDimensions(); }
 
     void UpdateDimensions()
         { CalcDimensions(); }
 


@@ -812,28 +749,28 @@ class WXDLLEXPORT wxGrid : public wxScrolledWindow
     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 0; }
     int GetScrollPosY() { return 0; }
     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 SetScrollX( int x ) { }
     void SetScrollY( int y ) { }
 
     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() // returned num whole rows visible
         { return 0; }
     int GetViewHeight() // returned num whole rows visible
         { return 0; }

-    
+

     int GetViewWidth() // returned num whole cols visible
         { return 0; }
 
     int GetViewWidth() // returned num whole cols visible
         { return 0; }
 


@@ -883,7 +820,7 @@ class WXDLLEXPORT wxGrid : public wxScrolledWindow
             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 )


@@ -892,34 +829,35 @@ class WXDLLEXPORT wxGrid : public wxScrolledWindow
                 return GetRowLabelValue( pos );
         }
 
                 return GetRowLabelValue( pos );
         }
 

-    wxFont GetCellTextFont() const 
+    wxFont GetCellTextFont() const

         { return m_defaultCellFont; }
         { return m_defaultCellFont; }

-        
+

     wxFont GetCellTextFont(int WXUNUSED(row), int WXUNUSED(col)) const
         { return m_defaultCellFont; }
     wxFont GetCellTextFont(int WXUNUSED(row), int WXUNUSED(col)) const
         { return m_defaultCellFont; }

-        
+

     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); }


@@ -929,7 +867,7 @@ class WXDLLEXPORT wxGrid : public wxScrolledWindow
     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 **********
 
 


@@ -944,7 +882,127 @@ class WXDLLEXPORT wxGrid : public wxScrolledWindow
            wxGRID_CHOICE,
            wxGRID_COMBOBOX };
 
            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;
+
+    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;
+
+    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;
+
+    // default cell attributes
+    wxFont     m_defaultCellFont;
+    int        m_defaultCellHAlign,
+               m_defaultCellVAlign;
+
+    // do we have some place to store attributes in?
+    bool CanHaveAttributes();
+
+    wxGridCellCoordsArray  m_cellsExposed;
+    wxArrayInt             m_rowsExposed;
+    wxArrayInt             m_colsExposed;
+    wxArrayInt             m_rowLabelsExposed;
+    wxArrayInt             m_colLabelsExposed;
+
+    bool m_inOnKeyDown;
+    int  m_batchCount;
+
+    int  m_cursorMode;
+    enum { 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;
+
+    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 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_DYNAMIC_CLASS( wxGrid )
     DECLARE_EVENT_TABLE()
 };


@@ -959,17 +1017,7 @@ class WXDLLEXPORT wxGrid : public wxScrolledWindow
 
 class WXDLLEXPORT wxGridEvent : public wxNotifyEvent
 {
 
 class WXDLLEXPORT wxGridEvent : public wxNotifyEvent
 {

-  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;
-        
-  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)


@@ -988,22 +1036,23 @@ class WXDLLEXPORT wxGridEvent : public wxNotifyEvent
     bool        ShiftDown() { return m_shift; }
     bool        AltDown() { return m_alt; }
 
     bool        ShiftDown() { return m_shift; }
     bool        AltDown() { return m_alt; }
 

-    DECLARE_DYNAMIC_CLASS(wxGridEvent)
-};
-
-
-class WXDLLEXPORT wxGridSizeEvent : public wxNotifyEvent
-{
-  protected:
-    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)


@@ -1021,37 +1070,38 @@ class WXDLLEXPORT wxGridSizeEvent : public wxNotifyEvent
     bool        ShiftDown() { return m_shift; }
     bool        AltDown() { return m_alt; }
 
     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
 {
     DECLARE_DYNAMIC_CLASS(wxGridSizeEvent)
 };
 
 
 class WXDLLEXPORT wxGridRangeSelectEvent : public wxNotifyEvent
 {

-  protected:
-    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; }


@@ -1064,6 +1114,14 @@ class WXDLLEXPORT wxGridRangeSelectEvent : public wxNotifyEvent
     bool        ShiftDown()    { return m_shift; }
     bool        AltDown()      { return m_alt; }
 
     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)
 };
 
     DECLARE_DYNAMIC_CLASS(wxGridRangeSelectEvent)
 };
 


@@ -1098,7 +1156,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 },
 
 


@@ -1117,3 +1175,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

+