no message

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

diff --git a/include/wx/generic/gridg.h b/include/wx/generic/gridg.h
index d3ef3c2766cec524a29bf0dc5e20e9ce03799431..b7bd11f4bee8d3cf5eb5bda472d699112e42e618 100644 (file)
--- a/include/wx/generic/gridg.h
+++ b/include/wx/generic/gridg.h
@@ -20,10 +20,11 @@
 #include "wx/panel.h"
 #include "wx/string.h"
 #include "wx/scrolbar.h"
 #include "wx/panel.h"
 #include "wx/string.h"
 #include "wx/scrolbar.h"

+#include "wx/event.h"

 
 #define wxGRID_DEFAULT_EDIT_WIDTH 300
 #define wxGRID_DEFAULT_EDIT_HEIGHT 27
 
 #define wxGRID_DEFAULT_EDIT_WIDTH 300
 #define wxGRID_DEFAULT_EDIT_HEIGHT 27

-#define wxGRID_DEFAULT_EDIT_X 5
+#define wxGRID_DEFAULT_EDIT_X 2

 #define wxGRID_DEFAULT_EDIT_Y 1
 #define wxGRID_DEFAULT_SHEET_TOP 31
 #define wxGRID_DEFAULT_SHEET_LEFT 0
 #define wxGRID_DEFAULT_EDIT_Y 1
 #define wxGRID_DEFAULT_SHEET_TOP 31
 #define wxGRID_DEFAULT_SHEET_LEFT 0


@@ -40,98 +41,39 @@
 #define wxRIGHT 0x0800
 #endif
 
 #define wxRIGHT 0x0800
 #endif
 

-#define WXGENERIC_GRID_VERSION  0.4
+#define WXGENERIC_GRID_VERSION  0.5

 
 

+class WXDLLEXPORT wxGridEvent;

 class WXDLLEXPORT wxGridCell;
 class WXDLLEXPORT wxGenericGrid: public wxPanel
 {
   DECLARE_DYNAMIC_CLASS(wxGenericGrid)
 class WXDLLEXPORT wxGridCell;
 class WXDLLEXPORT wxGenericGrid: public wxPanel
 {
   DECLARE_DYNAMIC_CLASS(wxGenericGrid)

- protected:
-  wxTextCtrl *textItem;
-  wxScrollBar *hScrollBar;
-  wxScrollBar *vScrollBar;
-  int wCursorRow;
-  int wCursorColumn;
-  wxRectangle CurrentRect;
-  bool currentRectVisible;
-  wxGridCell ***gridCells;
-  wxGridCell **rowLabelCells;
-  wxGridCell **colLabelCells;
-  bool bEditCreated;
-  bool editable;
-
-  int totalRows;
-  int totalCols;
-  
-  // Row and column we're currently looking at
-  int scrollPosX;
-  int scrollPosY;
-
-  // Dimensions
-  int leftOfSheet;
-  int topOfSheet;
-  int rightOfSheet;    // Calculated from colWidths
-  int bottomOfSheet;   // Calculated from rowHeights
-  int totalGridWidth; // Total 'virtual' size
-  int totalGridHeight;
-  int cellHeight;      // For now, a default
-  int verticalLabelWidth;
-  int horizontalLabelHeight;
-  int verticalLabelAlignment;
-  int horizontalLabelAlignment;
-  int cellAlignment;
-  short *colWidths;   // Dynamically allocated
-  short *rowHeights;  // Dynamically allocated
-  int scrollWidth;    // Vert. scroll width, horiz. scroll height
-  
-  // Colours
-  wxColour cellTextColour;
-  wxColour cellBackgroundColour;
-  wxFont *cellTextFont;
-  wxColour labelTextColour;
-  wxColour labelBackgroundColour;
-  wxBrush *labelBackgroundBrush;
-  wxFont *labelTextFont;
-  wxPen *divisionPen;
-
-  // Position of Edit control
-  wxRectangle editControlPosition;
-  
-  // Drag status
-  int dragStatus;
-  int dragRowOrCol;
-  int dragStartPosition;
-  int dragLastPosition;
-  static wxCursor *horizontalSashCursor;
-  static wxCursor *verticalSashCursor;
-  
-  // Don't refresh whilst this is > 0
-  int batchCount;
-  

  public:
   wxGenericGrid(void);
 
  public:
   wxGenericGrid(void);
 

-  inline wxGenericGrid(wxWindow *parent, int x, int y, int width, int height, const long style = 0, char *name = "grid")
+  inline wxGenericGrid(wxWindow *parent, int x, int y, int width, int height, long style = 0, char *name = "grid")

   {
     Create(parent, -1, wxPoint(x, y), wxSize(width, height), style, name);
   }
   {
     Create(parent, -1, wxPoint(x, y), wxSize(width, height), style, name);
   }

-  inline wxGenericGrid(wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, const long style = 0, const wxString& name = "grid")
+  inline wxGenericGrid(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style = 0, const wxString& name = "grid")

   {
     Create(parent, id, pos, size, style, name);
   }
   ~wxGenericGrid(void);
 
   void OnPaint(wxPaintEvent& event);
   {
     Create(parent, id, pos, size, style, name);
   }
   ~wxGenericGrid(void);
 
   void OnPaint(wxPaintEvent& event);

+  void OnEraseBackground(wxEraseEvent& event);

   void OnMouseEvent(wxMouseEvent& event);
   void OnSize(wxSizeEvent& event);
 
   void OnMouseEvent(wxMouseEvent& event);
   void OnSize(wxSizeEvent& event);
 

-  bool Create(wxWindow *parent, const wxWindowID, const wxPoint& pos, const wxSize& size, const long style = 0, const wxString& name = "grid");
+  bool Create(wxWindow *parent, wxWindowID, const wxPoint& pos, const wxSize& size, long style = 0, const wxString& name = "grid");

 
 

-  bool CreateGrid(int nRows, int nCols, wxString **cellValues = NULL, short *widths = NULL,
+  bool CreateGrid(int nRows, int nCols, wxString **cellValues = (wxString **) NULL, short *widths = (short *) NULL,

      short defaultWidth = wxGRID_DEFAULT_CELL_WIDTH, short defaultHeight = wxGRID_DEFAULT_CELL_HEIGHT);
      short defaultWidth = wxGRID_DEFAULT_CELL_WIDTH, short defaultHeight = wxGRID_DEFAULT_CELL_HEIGHT);

+  void PaintGrid(wxDC& dc);

   void ClearGrid(void);
   void ClearGrid(void);

-  virtual wxGridCell *GetCell(int row, int col);
-  inline wxGridCell ***GetCells(void) { return gridCells; }
+  virtual wxGridCell *GetCell(int row, int col) const;
+  inline wxGridCell ***GetCells(void) const { return m_gridCells; }

   bool InsertCols(int pos = 0, int n = 1, bool updateLabels = TRUE);
   bool InsertRows(int pos = 0, int n = 1, bool updateLabels = TRUE);
   bool AppendCols(int n = 1, bool updateLabels = TRUE);
   bool InsertCols(int pos = 0, int n = 1, bool updateLabels = TRUE);
   bool InsertRows(int pos = 0, int n = 1, bool updateLabels = TRUE);
   bool AppendCols(int n = 1, bool updateLabels = TRUE);


@@ -141,85 +83,89 @@ class WXDLLEXPORT wxGenericGrid: public wxPanel
 
   // Cell accessors
   void SetCellValue(const wxString& val, int row, int col);
 
   // Cell accessors
   void SetCellValue(const wxString& val, int row, int col);

-  wxString& GetCellValue(int row, int col);
+  wxString& GetCellValue(int row, int col) const;

   void SetCellAlignment(int flag, int row, int col);
   void SetCellAlignment(int flag);
   void SetCellAlignment(int flag, int row, int col);
   void SetCellAlignment(int flag);

-  int GetCellAlignment(int row, int col);
-  int GetCellAlignment(void);
+  int GetCellAlignment(int row, int col) const;
+  int GetCellAlignment(void) const;

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

-  wxColour& GetCellTextColour(int row, int col);
-  inline wxColour& GetCellTextColour(void) { return cellTextColour; }
+  wxColour& GetCellTextColour(int row, int col) const;
+  inline wxColour& GetCellTextColour(void) const { return (wxColour&) m_cellTextColour; }

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

-  inline wxColour& GetCellBackgroundColour(void) { return cellBackgroundColour; }
-  wxColour& GetCellBackgroundColour(int row, int col);
-  inline wxFont *GetCellTextFont(void) { return cellTextFont; }
-  wxFont *GetCellTextFont(int row, int col);
-  void SetCellTextFont(wxFont *fnt);
-  void SetCellTextFont(wxFont *fnt, int row, int col);
-  wxBitmap *GetCellBitmap(int row, int col);
+  inline wxColour& GetCellBackgroundColour(void) const { return (wxColour&) m_cellBackgroundColour; }
+  wxColour& GetCellBackgroundColour(int row, int col) const;
+  inline wxFont& GetCellTextFont(void) const { return (wxFont&) m_cellTextFont; }
+  wxFont& GetCellTextFont(int row, int col) const;
+  void SetCellTextFont(const wxFont& fnt);
+  void SetCellTextFont(const wxFont& fnt, int row, int col);
+  wxBitmap *GetCellBitmap(int row, int col) const;

   void SetCellBitmap(wxBitmap *bitmap, int row, int col);
   void SetCellBitmap(wxBitmap *bitmap, int row, int col);

-  
+

   // Size accessors
   void SetColumnWidth(int col, int width);
   // Size accessors
   void SetColumnWidth(int col, int width);

-  int GetColumnWidth(int col);
+  int GetColumnWidth(int col) const;

   void SetRowHeight(int row, int height);
   void SetRowHeight(int row, int height);

-  int GetRowHeight(int row);
-  
+  int GetRowHeight(int row) const;
+

   // Label accessors
   void SetLabelSize(int orientation, int sz);
   // Label accessors
   void SetLabelSize(int orientation, int sz);

-  int GetLabelSize(int orientation);
+  int GetLabelSize(int orientation) const;

   void SetLabelAlignment(int orientation, int alignment);
   void SetLabelAlignment(int orientation, int alignment);

-  int GetLabelAlignment(int orientation);
-  wxGridCell *GetLabelCell(int orientation, int pos);
+  int GetLabelAlignment(int orientation) const;
+  wxGridCell *GetLabelCell(int orientation, int pos) const;

   void SetLabelValue(int orientation, const wxString& val, int pos);
   void SetLabelValue(int orientation, const wxString& val, int pos);

-  wxString& GetLabelValue(int orientation, int pos);
+  wxString& GetLabelValue(int orientation, int pos) const;

   void SetLabelTextColour(const wxColour& colour);
   void SetLabelBackgroundColour(const wxColour& colour);
   void SetLabelTextColour(const wxColour& colour);
   void SetLabelBackgroundColour(const wxColour& colour);

-  inline wxColour& GetLabelTextColour(void) { return labelTextColour; }
-  inline wxColour& GetLabelBackgroundColour(void) { return labelBackgroundColour; }
-  inline wxFont *GetLabelTextFont(void) { return labelTextFont; }
-  inline void SetLabelTextFont(wxFont *fnt) { labelTextFont = fnt; }
+  inline wxColour& GetLabelTextColour(void) const { return (wxColour&) m_labelTextColour; }
+  inline wxColour& GetLabelBackgroundColour(void) { return (wxColour&) m_labelBackgroundColour; }
+  inline wxFont& GetLabelTextFont(void) { return (wxFont&) m_labelTextFont; }
+  inline void SetLabelTextFont(const wxFont& fnt) { m_labelTextFont = fnt; }

 
   // Miscellaneous accessors
 
   // Miscellaneous accessors

-  inline int GetCursorRow(void) { return wCursorRow; }
-  inline int GetCursorColumn(void) { return wCursorColumn; }
+  inline int GetCursorRow(void) const { return m_wCursorRow; }
+  inline int GetCursorColumn(void) const { return m_wCursorColumn; }

   void SetGridCursor(int row, int col);
   void SetGridCursor(int row, int col);

-  inline int GetRows(void) { return totalRows; }
-  inline int GetCols(void) { return totalCols; }
-  inline int GetScrollPosX(void) { return scrollPosX; }
-  inline int GetScrollPosY(void) { return scrollPosY; }
-  inline void SetScrollPosX(int pos) { scrollPosX = pos; }
-  inline void SetScrollPosY(int pos) { scrollPosY = pos; }
-  inline wxTextCtrl *GetTextItem(void) { return textItem; }
-  inline wxScrollBar *GetHorizScrollBar(void) { return hScrollBar; }
-  inline wxScrollBar *GetVertScrollBar(void) { return vScrollBar; }
-  inline bool GetEditable(void) { return editable; }
+  inline int GetRows(void) const { return m_totalRows; }
+  inline int GetCols(void) const { return m_totalCols; }
+  inline int GetScrollPosX(void) const { return m_scrollPosX; }
+  inline int GetScrollPosY(void) const { return m_scrollPosY; }
+  inline void SetScrollPosX(int pos) { m_scrollPosX = pos; }
+  inline void SetScrollPosY(int pos) { m_scrollPosY = pos; }
+  inline wxTextCtrl *GetTextItem(void) const { return m_textItem; }
+  inline wxScrollBar *GetHorizScrollBar(void) const { return m_hScrollBar; }
+  inline wxScrollBar *GetVertScrollBar(void) const { return m_vScrollBar; }
+  inline bool GetEditable(void) const { return m_editable; }

   void SetEditable(bool edit);
   void SetEditable(bool edit);

-  inline wxRectangle& GetCurrentRect(void) { return CurrentRect; }
-  inline bool CurrentCellVisible(void) { return currentRectVisible; }
-  inline void SetDividerPen(wxPen *pen) { divisionPen = pen; }
-  inline wxPen *GetDividerPen(void) { return divisionPen; }
-  
+  inline wxRect& GetCurrentRect(void) const { return (wxRect&) m_currentRect; }
+  inline bool CurrentCellVisible(void) const { return m_currentRectVisible; }
+  inline void SetDividerPen(const wxPen& pen) { m_divisionPen = pen; }
+  inline wxPen& GetDividerPen(void) const { return (wxPen&) m_divisionPen; }
+

   // High-level event handling
   // Override e.g. to check value of current cell; but call
   // base member for default processing.
   virtual void OnSelectCellImplementation(wxDC *dc, int row, int col);
 
   virtual void OnSelectCell(int WXUNUSED(row), int WXUNUSED(col)) {};
   // High-level event handling
   // Override e.g. to check value of current cell; but call
   // base member for default processing.
   virtual void OnSelectCellImplementation(wxDC *dc, int row, int col);
 
   virtual void OnSelectCell(int WXUNUSED(row), int WXUNUSED(col)) {};

+  void _OnSelectCell(wxGridEvent& event);

 
   // Override to create your own class of grid cell
   virtual wxGridCell *OnCreateCell(void);
 
   // Override to create your own class of grid cell
   virtual wxGridCell *OnCreateCell(void);

-  
+  void _OnCreateCell(wxGridEvent& event);
+

   // Override to change labels e.g. creation of grid, inserting/deleting a row/col.
   // By default, auto-labels the grid.
   virtual void OnChangeLabels(void);
   // Override to change labels e.g. creation of grid, inserting/deleting a row/col.
   // By default, auto-labels the grid.
   virtual void OnChangeLabels(void);

+  void _OnChangeLabels(wxGridEvent& event);

 
   // Override to change the label of the edit field when selecting a cell
   // By default, sets it to e.g. A12
   virtual void OnChangeSelectionLabel(void);
 
   // Override to change the label of the edit field when selecting a cell
   // By default, sets it to e.g. A12
   virtual void OnChangeSelectionLabel(void);

-  
+  void _OnChangeSelectionLabel(wxGridEvent& event);
+

   // Override for event processing
   virtual void OnCellChange(int WXUNUSED(row), int WXUNUSED(col)) {};
   virtual void OnCellLeftClick(int WXUNUSED(row), int WXUNUSED(col), int WXUNUSED(x), int WXUNUSED(y), bool WXUNUSED(control), bool WXUNUSED(shift)) {};
   // Override for event processing
   virtual void OnCellChange(int WXUNUSED(row), int WXUNUSED(col)) {};
   virtual void OnCellLeftClick(int WXUNUSED(row), int WXUNUSED(col), int WXUNUSED(x), int WXUNUSED(y), bool WXUNUSED(control), bool WXUNUSED(shift)) {};


@@ -227,6 +173,12 @@ class WXDLLEXPORT wxGenericGrid: public wxPanel
   virtual void OnLabelLeftClick(int WXUNUSED(row), int WXUNUSED(col), int WXUNUSED(x), int WXUNUSED(y), bool WXUNUSED(control), bool WXUNUSED(shift)) {};
   virtual void OnLabelRightClick(int WXUNUSED(row), int WXUNUSED(col), int WXUNUSED(x), int WXUNUSED(y), bool WXUNUSED(control), bool WXUNUSED(shift)) {};
 
   virtual void OnLabelLeftClick(int WXUNUSED(row), int WXUNUSED(col), int WXUNUSED(x), int WXUNUSED(y), bool WXUNUSED(control), bool WXUNUSED(shift)) {};
   virtual void OnLabelRightClick(int WXUNUSED(row), int WXUNUSED(col), int WXUNUSED(x), int WXUNUSED(y), bool WXUNUSED(control), bool WXUNUSED(shift)) {};
 

+  void _OnCellChange(wxGridEvent& event);
+  void _OnCellLeftClick(wxGridEvent& event);
+  void _OnCellRightClick(wxGridEvent& event);
+  void _OnLabelLeftClick(wxGridEvent& event);
+  void _OnLabelRightClick(wxGridEvent& event);
+

   // Activation: call from wxFrame::OnActivate
   void OnActivate(bool active);
 
   // Activation: call from wxFrame::OnActivate
   void OnActivate(bool active);
 


@@ -248,26 +200,90 @@ class WXDLLEXPORT wxGenericGrid: public wxPanel
   virtual void DrawEditableArea(wxDC *dc);
   virtual void DrawGridLines(wxDC *dc);
   virtual void DrawColumnLabels(wxDC *dc);
   virtual void DrawEditableArea(wxDC *dc);
   virtual void DrawGridLines(wxDC *dc);
   virtual void DrawColumnLabels(wxDC *dc);

-  virtual void DrawColumnLabel(wxDC *dc, wxRectangle *rect, int col);
+  virtual void DrawColumnLabel(wxDC *dc, wxRect *rect, int col);

   virtual void DrawRowLabels(wxDC *dc);
   virtual void DrawRowLabels(wxDC *dc);

-  virtual void DrawRowLabel(wxDC *dc, wxRectangle *rect, int row);
+  virtual void DrawRowLabel(wxDC *dc, wxRect *rect, int row);

   virtual void DrawCells(wxDC *dc);
   virtual void DrawCells(wxDC *dc);

-  virtual void DrawCellValue(wxDC *dc, wxRectangle *rect, int row, int col);
-  virtual void DrawCellBackground(wxDC *dc, wxRectangle *rect, int row, int col);
-  virtual void DrawTextRect(wxDC *dc, const wxString& text, wxRectangle *rect, int flag);
-  virtual void DrawBitmapRect(wxDC *dc, wxBitmap *bitmap, wxRectangle *rect, int flag);
+  virtual void DrawCellValue(wxDC *dc, wxRect *rect, int row, int col);
+  virtual void DrawCellBackground(wxDC *dc, wxRect *rect, int row, int col);
+  virtual void DrawTextRect(wxDC *dc, const wxString& text, wxRect *rect, int flag);
+  virtual void DrawBitmapRect(wxDC *dc, wxBitmap *bitmap, wxRect *rect, int flag);

 
   // Refresh cell and optionally set the text field
   void RefreshCell(int row, int col, bool setText = FALSE);
 
   // Don't refresh within the outer pair of these.
 
   // Refresh cell and optionally set the text field
   void RefreshCell(int row, int col, bool setText = FALSE);
 
   // Don't refresh within the outer pair of these.

-  inline void BeginBatch(void) { batchCount ++; }
-  inline void EndBatch(void) { batchCount --; }
-  inline int GetBatchCount(void) { return batchCount; }
+  inline void BeginBatch(void) { m_batchCount ++; }
+  inline void EndBatch(void) { m_batchCount --; }
+  inline int GetBatchCount(void) { return m_batchCount; }

 
   void OnText(wxCommandEvent& ev);
   void OnGridScroll(wxScrollEvent& ev);
 
 
   void OnText(wxCommandEvent& ev);
   void OnGridScroll(wxScrollEvent& ev);
 

+ protected:
+  wxPanel*                  m_editingPanel;  // Contains the text control
+  wxTextCtrl*               m_textItem;
+  wxScrollBar*              m_hScrollBar;
+  wxScrollBar*              m_vScrollBar;
+  int                       m_wCursorRow;
+  int                       m_wCursorColumn;
+  wxRect                    m_currentRect;
+  bool                      m_currentRectVisible;
+  wxGridCell***             m_gridCells;
+  wxGridCell**              m_rowLabelCells;
+  wxGridCell**              m_colLabelCells;
+  bool                      m_editCreated;
+  bool                      m_editable;
+
+  int                       m_totalRows;
+  int                       m_totalCols;
+
+  // Row and column we're currently looking at
+  int                       m_scrollPosX;
+  int                       m_scrollPosY;
+
+  // Dimensions
+  int                       m_leftOfSheet;
+  int                       m_topOfSheet;
+  int                       m_rightOfSheet;    // Calculated from m_colWidths
+  int                       m_bottomOfSheet;   // Calculated from m_rowHeights
+  int                       m_totalGridWidth; // Total 'virtual' size
+  int                       m_totalGridHeight;
+  int                       m_cellHeight;      // For now, a default
+  int                       m_verticalLabelWidth;
+  int                       m_horizontalLabelHeight;
+  int                       m_verticalLabelAlignment;
+  int                       m_horizontalLabelAlignment;
+  int                       m_cellAlignment;
+  short*                    m_colWidths;   // Dynamically allocated
+  short*                    m_rowHeights;  // Dynamically allocated
+  int                       m_scrollWidth;    // Vert. scroll width, horiz. scroll height
+
+  // Colours
+  wxColour                  m_cellTextColour;
+  wxColour                  m_cellBackgroundColour;
+  wxFont                    m_cellTextFont;
+  wxColour                  m_labelTextColour;
+  wxColour                  m_labelBackgroundColour;
+  wxBrush                   m_labelBackgroundBrush;
+  wxFont                    m_labelTextFont;
+  wxPen                     m_divisionPen;
+  wxBitmap*                 m_doubleBufferingBitmap;
+
+  // Position of Edit control
+  wxRect                    m_editControlPosition;
+
+  // Drag status
+  int                       m_dragStatus;
+  int                       m_dragRowOrCol;
+  int                       m_dragStartPosition;
+  int                       m_dragLastPosition;
+  wxCursor                  m_horizontalSashCursor;
+  wxCursor                  m_verticalSashCursor;
+
+  // To avoid multiple refreshes, use Begin/EndBatch
+  int                       m_batchCount;
+

 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };
 


@@ -278,29 +294,30 @@ DECLARE_EVENT_TABLE()
 class WXDLLEXPORT wxGridCell: public wxObject
 {
  public:
 class WXDLLEXPORT wxGridCell: public wxObject
 {
  public:

-  wxString textValue;
-  wxFont *font;
-  wxColour textColour;
-  wxColour backgroundColour;
-  wxBrush *backgroundBrush;
-  wxBitmap *cellBitmap;
+  wxString  textValue;
+  wxFont    font;
+  wxColour  textColour;
+  wxColour  backgroundColour;
+  wxBrush   backgroundBrush;
+  wxBitmap* cellBitmap;

   int alignment;
 
   int alignment;
 

-  wxGridCell(wxGenericGrid *window = NULL);
+  wxGridCell(wxGenericGrid *window = (wxGenericGrid *) NULL);

   ~wxGridCell(void);
   ~wxGridCell(void);

-  
-  virtual wxString& GetTextValue(void) { return textValue; }
+
+  virtual wxString& GetTextValue(void) const { return (wxString&) textValue; }

   virtual void SetTextValue(const wxString& str) { textValue = str; }
   virtual void SetTextValue(const wxString& str) { textValue = str; }

-  inline wxFont *GetFont(void) { return font; }
-  inline void SetFont(wxFont *f) { font = f; }
-  inline wxColour& GetTextColour(void) { return textColour; }
+  inline wxFont& GetFont(void) const { return (wxFont&) font; }
+  inline void SetFont(const wxFont& f) { font = f; }
+  inline wxColour& GetTextColour(void) const { return (wxColour&) textColour; }

   inline void SetTextColour(const wxColour& colour) { textColour = colour; }
   inline void SetTextColour(const wxColour& colour) { textColour = colour; }

-  inline wxColour& GetBackgroundColour(void) { return backgroundColour; }
+  inline wxColour& GetBackgroundColour(void) const { return (wxColour&) backgroundColour; }

   void SetBackgroundColour(const wxColour& colour);
   void SetBackgroundColour(const wxColour& colour);

-  inline wxBrush *GetBackgroundBrush(void) { return backgroundBrush; }
-  inline int GetAlignment(void) { return alignment; }
+  inline wxBrush& GetBackgroundBrush(void) const { return (wxBrush&) backgroundBrush; }
+  inline void SetBackgroundBrush(const wxBrush& brush) { backgroundBrush = brush; }
+  inline int GetAlignment(void) const { return alignment; }

   inline void SetAlignment(int align) { alignment = align; }
   inline void SetAlignment(int align) { alignment = align; }

-  inline wxBitmap *GetCellBitmap(void) { return cellBitmap; }
+  inline wxBitmap *GetCellBitmap(void) const { return cellBitmap; }

   inline void SetCellBitmap(wxBitmap *bitmap) { cellBitmap = bitmap; }
 };
 
   inline void SetCellBitmap(wxBitmap *bitmap) { cellBitmap = bitmap; }
 };
 


@@ -315,5 +332,55 @@ class WXDLLEXPORT wxGrid: public wxGenericGrid
     }
 };
 
     }
 };
 

+class WXDLLEXPORT wxGridEvent : public wxCommandEvent {
+    DECLARE_DYNAMIC_CLASS(wxGridEvent)
+public:
+    wxGridEvent()
+        : wxCommandEvent(), m_row(-1), m_col(-1), m_x(-1), m_y(-1),
+          m_control(0), m_shift(0), m_cell(0)
+        {}
+
+    wxGridEvent(int id, wxEventType type, wxObject* obj,
+                int row=-1, int col=-1, int x=-1, int y=-1,
+                bool control=FALSE, bool shift=FALSE)
+        : wxCommandEvent(type, id), m_row(row), m_col(col), m_x(x), m_y(y),
+          m_control(control), m_shift(shift), m_cell(0)
+        {
+            SetEventObject(obj);
+        }
+
+
+    int         m_row;
+    int         m_col;
+    int         m_x;
+    int         m_y;
+    bool        m_control;
+    bool        m_shift;
+    wxGridCell* m_cell;
+};
+
+const wxEventType wxEVT_GRID_SELECT_CELL      = wxEVT_FIRST + 1575;
+const wxEventType wxEVT_GRID_CREATE_CELL      = wxEVT_FIRST + 1576;
+const wxEventType wxEVT_GRID_CHANGE_LABELS    = wxEVT_FIRST + 1577;
+const wxEventType wxEVT_GRID_CHANGE_SEL_LABEL = wxEVT_FIRST + 1578;
+const wxEventType wxEVT_GRID_CELL_CHANGE      = wxEVT_FIRST + 1579;
+const wxEventType wxEVT_GRID_CELL_LCLICK      = wxEVT_FIRST + 1580;
+const wxEventType wxEVT_GRID_CELL_RCLICK      = wxEVT_FIRST + 1581;
+const wxEventType wxEVT_GRID_LABEL_LCLICK     = wxEVT_FIRST + 1582;
+const wxEventType wxEVT_GRID_LABEL_RCLICK     = wxEVT_FIRST + 1583;
+
+
+typedef void (wxEvtHandler::*wxGridEventFunction)(wxGridEvent&);
+
+#define EVT_GRID_SELECT_CELL(fn)      { wxEVT_GRID_SELECT_CELL,      -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
+#define EVT_GRID_CREATE_CELL(fn)      { wxEVT_GRID_CREATE_CELL,      -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
+#define EVT_GRID_CHANGE_LABELS(fn)    { wxEVT_GRID_CHANGE_LABELS,    -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
+#define EVT_GRID_CHANGE_SEL_LABEL(fn) { wxEVT_GRID_CHANGE_SEL_LABEL, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
+#define EVT_GRID_CELL_CHANGE(fn)      { wxEVT_GRID_CELL_CHANGE,      -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
+#define EVT_GRID_CELL_LCLICK(fn)      { wxEVT_GRID_CELL_LCLICK,      -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
+#define EVT_GRID_CELL_RCLICK(fn)      { wxEVT_GRID_CELL_RCLICK,      -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
+#define EVT_GRID_LABEL_LCLICK(fn)     { wxEVT_GRID_LABEL_LCLICK,     -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
+#define EVT_GRID_LABEL_RCLICK(fn)     { wxEVT_GRID_LABEL_RCLICK,     -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
+

 #endif
 
 #endif