added linear and concentric gradient fill functions (modified/fixed patch from Ryan...

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

diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index 4c0ed3e73f08bc4ecb24cbf8ddbb17384d9a2c30..80156c82392f1c2f6b964e1f7f53571dd5c62984 100644 (file)
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        grid.h
+// Name:        wx/generic/grid.h

 // Purpose:     wxGrid and related classes
 // Author:      Michael Bedward (based on code by Julian Smart, Robin Dunn)
 // Modified by:
 // Purpose:     wxGrid and related classes
 // Author:      Michael Bedward (based on code by Julian Smart, Robin Dunn)
 // Modified by:


@@ -9,27 +9,24 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/defs.h"
-
-#if !defined(wxUSE_NEW_GRID) || !(wxUSE_NEW_GRID)
-#include "gridg.h"
-#else
-

 #ifndef __WXGRID_H__
 #define __WXGRID_H__
 
 #ifndef __WXGRID_H__
 #define __WXGRID_H__
 

-#ifdef __GNUG__
-#pragma interface "grid.h"
-#endif
-
+#include "wx/hashmap.h"

 #include "wx/panel.h"
 #include "wx/scrolwin.h"
 #include "wx/string.h"
 #include "wx/panel.h"
 #include "wx/scrolwin.h"
 #include "wx/string.h"

+#include "wx/arrstr.h"

 #include "wx/scrolbar.h"
 #include "wx/event.h"
 #include "wx/combobox.h"
 #include "wx/dynarray.h"
 #include "wx/timer.h"
 #include "wx/scrolbar.h"
 #include "wx/event.h"
 #include "wx/combobox.h"
 #include "wx/dynarray.h"
 #include "wx/timer.h"

+#include "wx/clntdata.h"
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------

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


@@ -43,36 +40,95 @@
 #define WXGRID_DEFAULT_COL_WIDTH              80
 #define WXGRID_DEFAULT_COL_LABEL_HEIGHT       32
 #define WXGRID_DEFAULT_ROW_LABEL_WIDTH        82
 #define WXGRID_DEFAULT_COL_WIDTH              80
 #define WXGRID_DEFAULT_COL_LABEL_HEIGHT       32
 #define WXGRID_DEFAULT_ROW_LABEL_WIDTH        82

-#define WXGRID_LABEL_EDGE_ZONE                 5
+#define WXGRID_LABEL_EDGE_ZONE                 2

 #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
 

+// type names for grid table values
+#define wxGRID_VALUE_STRING     _T("string")
+#define wxGRID_VALUE_BOOL       _T("bool")
+#define wxGRID_VALUE_NUMBER     _T("long")
+#define wxGRID_VALUE_FLOAT      _T("double")
+#define wxGRID_VALUE_CHOICE     _T("choice")
+
+#define wxGRID_VALUE_TEXT wxGRID_VALUE_STRING
+#define wxGRID_VALUE_LONG wxGRID_VALUE_NUMBER
+

 // ----------------------------------------------------------------------------
 // forward declarations
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // 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;
+class WXDLLIMPEXP_ADV wxGrid;
+class WXDLLIMPEXP_ADV wxGridCellAttr;
+class WXDLLIMPEXP_ADV wxGridCellAttrProviderData;
+class WXDLLIMPEXP_ADV wxGridColLabelWindow;
+class WXDLLIMPEXP_ADV wxGridCornerLabelWindow;
+class WXDLLIMPEXP_ADV wxGridRowLabelWindow;
+class WXDLLIMPEXP_ADV wxGridTableBase;
+class WXDLLIMPEXP_ADV wxGridWindow;
+class WXDLLIMPEXP_ADV wxGridTypeRegistry;
+class WXDLLIMPEXP_ADV wxGridSelection;

 
 class WXDLLEXPORT wxCheckBox;
 
 class WXDLLEXPORT wxCheckBox;

+class WXDLLEXPORT wxComboBox;

 class WXDLLEXPORT wxTextCtrl;
 class WXDLLEXPORT wxTextCtrl;

+#if wxUSE_SPINCTRL
+class WXDLLEXPORT wxSpinCtrl;
+#endif
+
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+
+#define wxSafeIncRef(p) if ( p ) (p)->IncRef()
+#define wxSafeDecRef(p) if ( p ) (p)->DecRef()
+
+// ----------------------------------------------------------------------------
+// wxGridCellWorker: common base class for wxGridCellRenderer and
+// wxGridCellEditor
+//
+// NB: this is more an implementation convenience than a design issue, so this
+//     class is not documented and is not public at all
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_ADV wxGridCellWorker : public wxClientDataContainer
+{
+public:
+    wxGridCellWorker() { m_nRef = 1; }
+
+    // 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; }
+
+    // interpret renderer parameters: arbitrary string whose interpretatin is
+    // left to the derived classes
+    virtual void SetParameters(const wxString& params);
+
+protected:
+    // virtual dtor for any base class - private because only DecRef() can
+    // delete us
+    virtual ~wxGridCellWorker();
+
+private:
+    size_t m_nRef;
+
+    // suppress the stupid gcc warning about the class having private dtor and
+    // no friends
+    friend class wxGridCellWorkerDummyFriend;
+};

 
 // ----------------------------------------------------------------------------
 // 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
 
 // ----------------------------------------------------------------------------
 // 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.
+// predefined derived classes or derive your own class from it.

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGridCellRenderer
+class WXDLLIMPEXP_ADV wxGridCellRenderer : public wxGridCellWorker

 {
 public:
     // draw the given cell on the provided DC inside the given rectangle
 {
 public:
     // draw the given cell on the provided DC inside the given rectangle


@@ -88,10 +144,19 @@ public:
                       const wxRect& rect,
                       int row, int col,
                       bool isSelected) = 0;
                       const wxRect& rect,
                       int row, int col,
                       bool isSelected) = 0;

+
+    // get the preferred size of the cell for its contents
+    virtual wxSize GetBestSize(wxGrid& grid,
+                               wxGridCellAttr& attr,
+                               wxDC& dc,
+                               int row, int col) = 0;
+
+    // create a new object which is the copy of this one
+    virtual wxGridCellRenderer *Clone() const = 0;

 };
 
 // the default renderer for the cells containing string data
 };
 
 // the default renderer for the cells containing string data

-class WXDLLEXPORT wxGridCellStringRenderer : public wxGridCellRenderer
+class WXDLLIMPEXP_ADV wxGridCellStringRenderer : public wxGridCellRenderer

 {
 public:
     // draw the string
 {
 public:
     // draw the string


@@ -101,13 +166,97 @@ public:
                       const wxRect& rect,
                       int row, int col,
                       bool isSelected);
                       const wxRect& rect,
                       int row, int col,
                       bool isSelected);

+
+    // return the string extent
+    virtual wxSize GetBestSize(wxGrid& grid,
+                               wxGridCellAttr& attr,
+                               wxDC& dc,
+                               int row, int col);
+
+    virtual wxGridCellRenderer *Clone() const
+        { return new wxGridCellStringRenderer; }
+
+protected:
+    // set the text colours before drawing
+    void SetTextColoursAndFont(const wxGrid& grid,
+                               const wxGridCellAttr& attr,
+                               wxDC& dc,
+                               bool isSelected);
+
+    // calc the string extent for given string/font
+    wxSize DoGetBestSize(const wxGridCellAttr& attr,
+                         wxDC& dc,
+                         const wxString& text);

 };
 
 };
 

-// renderer for boolean fields
-class WXDLLEXPORT wxGridCellBoolRenderer : public wxGridCellRenderer
+// the default renderer for the cells containing numeric (long) data
+class WXDLLIMPEXP_ADV wxGridCellNumberRenderer : public wxGridCellStringRenderer

 {
 public:
 {
 public:

+    // draw the string right aligned
+    virtual void Draw(wxGrid& grid,
+                      wxGridCellAttr& attr,
+                      wxDC& dc,
+                      const wxRect& rect,
+                      int row, int col,
+                      bool isSelected);
+
+    virtual wxSize GetBestSize(wxGrid& grid,
+                               wxGridCellAttr& attr,
+                               wxDC& dc,
+                               int row, int col);

 
 

+    virtual wxGridCellRenderer *Clone() const
+        { return new wxGridCellNumberRenderer; }
+
+protected:
+    wxString GetString(const wxGrid& grid, int row, int col);
+};
+
+class WXDLLIMPEXP_ADV wxGridCellFloatRenderer : public wxGridCellStringRenderer
+{
+public:
+    wxGridCellFloatRenderer(int width = -1, int precision = -1);
+
+    // get/change formatting parameters
+    int GetWidth() const { return m_width; }
+    void SetWidth(int width) { m_width = width; m_format.clear(); }
+    int GetPrecision() const { return m_precision; }
+    void SetPrecision(int precision) { m_precision = precision; m_format.clear(); }
+
+    // draw the string right aligned with given width/precision
+    virtual void Draw(wxGrid& grid,
+                      wxGridCellAttr& attr,
+                      wxDC& dc,
+                      const wxRect& rect,
+                      int row, int col,
+                      bool isSelected);
+
+    virtual wxSize GetBestSize(wxGrid& grid,
+                               wxGridCellAttr& attr,
+                               wxDC& dc,
+                               int row, int col);
+
+    // parameters string format is "width[,precision]"
+    virtual void SetParameters(const wxString& params);
+
+    virtual wxGridCellRenderer *Clone() const;
+
+protected:
+    wxString GetString(const wxGrid& grid, int row, int col);
+
+private:
+    // formatting parameters
+    int m_width,
+        m_precision;
+
+    wxString m_format;
+};
+
+// renderer for boolean fields
+class WXDLLIMPEXP_ADV wxGridCellBoolRenderer : public wxGridCellRenderer
+{
+public:

     // draw a check mark or nothing
     virtual void Draw(wxGrid& grid,
                       wxGridCellAttr& attr,
     // draw a check mark or nothing
     virtual void Draw(wxGrid& grid,
                       wxGridCellAttr& attr,


@@ -115,6 +264,18 @@ public:
                       const wxRect& rect,
                       int row, int col,
                       bool isSelected);
                       const wxRect& rect,
                       int row, int col,
                       bool isSelected);

+
+    // return the checkmark size
+    virtual wxSize GetBestSize(wxGrid& grid,
+                               wxGridCellAttr& attr,
+                               wxDC& dc,
+                               int row, int col);
+
+    virtual wxGridCellRenderer *Clone() const
+        { return new wxGridCellBoolRenderer; }
+
+private:
+    static wxSize ms_sizeCheckMark;

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -125,13 +286,17 @@ public:
 // even for the entire grid.
 // ----------------------------------------------------------------------------
 
 // even for the entire grid.
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGridCellEditor
+class WXDLLIMPEXP_ADV wxGridCellEditor : public wxGridCellWorker

 {
 public:
     wxGridCellEditor();
 {
 public:
     wxGridCellEditor();

-    virtual ~wxGridCellEditor();

 
     bool IsCreated() { return m_control != NULL; }
 
     bool IsCreated() { return m_control != NULL; }

+    wxControl* GetControl() { return m_control; }
+    void SetControl(wxControl* control) { m_control = control; }
+
+    wxGridCellAttr* GetCellAttr() { return m_attr; }
+    void SetCellAttr(wxGridCellAttr* attr) { m_attr = attr; }

 
     // Creates the actual edit control
     virtual void Create(wxWindow* parent,
 
     // Creates the actual edit control
     virtual void Create(wxWindow* parent,


@@ -153,18 +318,25 @@ public:
     // to begin editing.  Set the focus to the edit control.
     virtual void BeginEdit(int row, int col, wxGrid* grid) = 0;
 
     // to begin editing.  Set the focus to the edit control.
     virtual void BeginEdit(int row, int col, wxGrid* grid) = 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) = 0;
+    // Complete the editing of the current cell. Returns true if the value has
+    // changed.  If necessary, the control may be destroyed.
+    virtual bool EndEdit(int row, int col, wxGrid* grid) = 0;

 
     // Reset the value in the control back to its starting value
     virtual void Reset() = 0;
 
 
     // Reset the value in the control back to its starting value
     virtual void Reset() = 0;
 

-    // If the editor is enabled by pressing keys on the grid,
-    // this will be called to let the editor do something about
-    // that first key if desired.
+    // return true to allow the given key to start editing: the base class
+    // version only checks that the event has no modifiers. The derived
+    // classes are supposed to do "if ( base::IsAcceptedKey() && ... )" in
+    // their IsAcceptedKey() implementation, although, of course, it is not a
+    // mandatory requirment.
+    //
+    // NB: if the key is F2 (special), editing will always start and this
+    //     method will not be called at all (but StartingKey() will)
+    virtual bool IsAcceptedKey(wxKeyEvent& event);
+
+    // If the editor is enabled by pressing keys on the grid, this will be
+    // called to let the editor do something about that first key if desired

     virtual void StartingKey(wxKeyEvent& event);
 
     // if the editor is enabled by clicking on the cell, this method will be
     virtual void StartingKey(wxKeyEvent& event);
 
     // if the editor is enabled by clicking on the cell, this method will be


@@ -178,20 +350,41 @@ public:
     // Final cleanup
     virtual void Destroy();
 
     // Final cleanup
     virtual void Destroy();
 

+    // create a new object which is the copy of this one
+    virtual wxGridCellEditor *Clone() const = 0;
+
+    // DJC MAPTEK
+    // added GetValue so we can get the value which is in the control
+    virtual wxString GetValue() const = 0;
+

 protected:
 protected:

+    // the dtor is private because only DecRef() can delete us
+    virtual ~wxGridCellEditor();
+

     // the control we show on screen
     wxControl*  m_control;
 
     // the control we show on screen
     wxControl*  m_control;
 

+    // a temporary pointer to the attribute being edited
+    wxGridCellAttr* m_attr;
+

     // if we change the colours/font of the control from the default ones, we
     // must restore the default later and we save them here between calls to
     // if we change the colours/font of the control from the default ones, we
     // must restore the default later and we save them here between calls to

-    // Show(TRUE) and Show(FALSE)
+    // Show(true) and Show(false)

     wxColour m_colFgOld,
              m_colBgOld;
     wxFont m_fontOld;
     wxColour m_colFgOld,
              m_colBgOld;
     wxFont m_fontOld;

+
+    // suppress the stupid gcc warning about the class having private dtor and
+    // no friends
+    friend class wxGridCellEditorDummyFriend;
+
+    DECLARE_NO_COPY_CLASS(wxGridCellEditor)

 };
 
 };
 

+#if wxUSE_TEXTCTRL
+

 // the editor for string/text data
 // the editor for string/text data

-class WXDLLEXPORT wxGridCellTextEditor : public wxGridCellEditor
+class WXDLLIMPEXP_ADV wxGridCellTextEditor : public wxGridCellEditor

 {
 public:
     wxGridCellTextEditor();
 {
 public:
     wxGridCellTextEditor();


@@ -199,27 +392,142 @@ public:
     virtual void Create(wxWindow* parent,
                         wxWindowID id,
                         wxEvtHandler* evtHandler);
     virtual void Create(wxWindow* parent,
                         wxWindowID id,
                         wxEvtHandler* evtHandler);

+    virtual void SetSize(const wxRect& rect);

 
     virtual void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr);
 
 
     virtual void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr);
 

+    virtual bool IsAcceptedKey(wxKeyEvent& event);

     virtual void BeginEdit(int row, int col, wxGrid* grid);
     virtual void BeginEdit(int row, int col, wxGrid* grid);

-    virtual bool EndEdit(int row, int col,  bool saveValue, wxGrid* grid);
+    virtual bool EndEdit(int row, int col, wxGrid* grid);

 
     virtual void Reset();
     virtual void StartingKey(wxKeyEvent& event);
     virtual void HandleReturn(wxKeyEvent& event);
 
 
     virtual void Reset();
     virtual void StartingKey(wxKeyEvent& event);
     virtual void HandleReturn(wxKeyEvent& event);
 

+    // parameters string format is "max_width"
+    virtual void SetParameters(const wxString& params);
+
+    virtual wxGridCellEditor *Clone() const
+        { return new wxGridCellTextEditor; }
+
+    // DJC MAPTEK
+    // added GetValue so we can get the value which is in the control
+    virtual wxString GetValue() const;

 protected:
     wxTextCtrl *Text() const { return (wxTextCtrl *)m_control; }
 
 protected:
     wxTextCtrl *Text() const { return (wxTextCtrl *)m_control; }
 

+    // parts of our virtual functions reused by the derived classes
+    void DoBeginEdit(const wxString& startValue);
+    void DoReset(const wxString& startValue);
+

 private:
 private:

+    size_t   m_maxChars;        // max number of chars allowed

     wxString m_startValue;
     wxString m_startValue;

+
+    DECLARE_NO_COPY_CLASS(wxGridCellTextEditor)
+};
+
+// the editor for numeric (long) data
+class WXDLLIMPEXP_ADV wxGridCellNumberEditor : public wxGridCellTextEditor
+{
+public:
+    // allows to specify the range - if min == max == -1, no range checking is
+    // done
+    wxGridCellNumberEditor(int min = -1, int max = -1);
+
+    virtual void Create(wxWindow* parent,
+                        wxWindowID id,
+                        wxEvtHandler* evtHandler);
+
+    virtual bool IsAcceptedKey(wxKeyEvent& event);
+    virtual void BeginEdit(int row, int col, wxGrid* grid);
+    virtual bool EndEdit(int row, int col, wxGrid* grid);
+
+    virtual void Reset();
+    virtual void StartingKey(wxKeyEvent& event);
+
+    // parameters string format is "min,max"
+    virtual void SetParameters(const wxString& params);
+
+    virtual wxGridCellEditor *Clone() const
+        { return new wxGridCellNumberEditor(m_min, m_max); }
+    // DJC MAPTEK
+    // added GetValue so we can get the value which is in the control
+    virtual wxString GetValue() const;
+
+protected:
+#if wxUSE_SPINCTRL
+    wxSpinCtrl *Spin() const { return (wxSpinCtrl *)m_control; }
+#endif
+
+    // if HasRange(), we use wxSpinCtrl - otherwise wxTextCtrl
+    bool HasRange() const
+    {
+#if wxUSE_SPINCTRL
+        return m_min != m_max;
+#else
+        return false;
+#endif
+    }
+
+    // string representation of m_valueOld
+    wxString GetString() const
+        { return wxString::Format(_T("%ld"), m_valueOld); }
+
+private:
+    int m_min,
+        m_max;
+
+    long m_valueOld;
+
+    DECLARE_NO_COPY_CLASS(wxGridCellNumberEditor)

 };
 
 };
 

+// the editor for floating point numbers (double) data
+class WXDLLIMPEXP_ADV wxGridCellFloatEditor : public wxGridCellTextEditor
+{
+public:
+    wxGridCellFloatEditor(int width = -1, int precision = -1);
+
+    virtual void Create(wxWindow* parent,
+                        wxWindowID id,
+                        wxEvtHandler* evtHandler);
+
+    virtual bool IsAcceptedKey(wxKeyEvent& event);
+    virtual void BeginEdit(int row, int col, wxGrid* grid);
+    virtual bool EndEdit(int row, int col, wxGrid* grid);
+
+    virtual void Reset();
+    virtual void StartingKey(wxKeyEvent& event);
+
+    virtual wxGridCellEditor *Clone() const
+        { return new wxGridCellFloatEditor(m_width, m_precision); }
+
+    // parameters string format is "width,precision"
+    virtual void SetParameters(const wxString& params);
+
+protected:
+    // string representation of m_valueOld
+    wxString GetString() const;
+
+private:
+    int m_width,
+        m_precision;
+    double m_valueOld;
+
+    DECLARE_NO_COPY_CLASS(wxGridCellFloatEditor)
+};
+
+#endif // wxUSE_TEXTCTRL
+
+#if wxUSE_CHECKBOX
+

 // the editor for boolean data
 // the editor for boolean data

-class WXDLLEXPORT wxGridCellBoolEditor : public wxGridCellEditor
+class WXDLLIMPEXP_ADV wxGridCellBoolEditor : public wxGridCellEditor

 {
 public:
 {
 public:

+    wxGridCellBoolEditor() { }
+

     virtual void Create(wxWindow* parent,
                         wxWindowID id,
                         wxEvtHandler* evtHandler);
     virtual void Create(wxWindow* parent,
                         wxWindowID id,
                         wxEvtHandler* evtHandler);


@@ -227,33 +535,104 @@ public:
     virtual void SetSize(const wxRect& rect);
     virtual void Show(bool show, wxGridCellAttr *attr = (wxGridCellAttr *)NULL);
 
     virtual void SetSize(const wxRect& rect);
     virtual void Show(bool show, wxGridCellAttr *attr = (wxGridCellAttr *)NULL);
 

+    virtual bool IsAcceptedKey(wxKeyEvent& event);

     virtual void BeginEdit(int row, int col, wxGrid* grid);
     virtual void BeginEdit(int row, int col, wxGrid* grid);

-    virtual bool EndEdit(int row, int col,  bool saveValue, wxGrid* grid);
+    virtual bool EndEdit(int row, int col, wxGrid* grid);

 
     virtual void Reset();
     virtual void StartingClick();
 
     virtual void Reset();
     virtual void StartingClick();

+    virtual void StartingKey(wxKeyEvent& event);
+
+    virtual wxGridCellEditor *Clone() const
+        { return new wxGridCellBoolEditor; }
+    // DJC MAPTEK
+    // added GetValue so we can get the value which is in the control
+    virtual wxString GetValue() const;

 
 protected:
     wxCheckBox *CBox() const { return (wxCheckBox *)m_control; }
 
 private:
     bool m_startValue;
 
 protected:
     wxCheckBox *CBox() const { return (wxCheckBox *)m_control; }
 
 private:
     bool m_startValue;

+
+    DECLARE_NO_COPY_CLASS(wxGridCellBoolEditor)

 };
 
 };
 

+#endif // wxUSE_CHECKBOX
+
+#if wxUSE_COMBOBOX
+
+// the editor for string data allowing to choose from the list of strings
+class WXDLLIMPEXP_ADV wxGridCellChoiceEditor : public wxGridCellEditor
+{
+public:
+    // if !allowOthers, user can't type a string not in choices array
+    wxGridCellChoiceEditor(size_t count = 0,
+                           const wxString choices[] = NULL,
+                           bool allowOthers = false);
+    wxGridCellChoiceEditor(const wxArrayString& choices,
+                           bool allowOthers = false);
+
+    virtual void Create(wxWindow* parent,
+                        wxWindowID id,
+                        wxEvtHandler* evtHandler);
+
+    virtual void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr);
+
+    virtual void BeginEdit(int row, int col, wxGrid* grid);
+    virtual bool EndEdit(int row, int col, wxGrid* grid);
+
+    virtual void Reset();
+
+    // parameters string format is "item1[,item2[...,itemN]]"
+    virtual void SetParameters(const wxString& params);
+
+    virtual wxGridCellEditor *Clone() const;
+    // DJC MAPTEK
+    // added GetValue so we can get the value which is in the control
+    virtual wxString GetValue() const;
+
+protected:
+    wxComboBox *Combo() const { return (wxComboBox *)m_control; }
+
+// DJC - (MAPTEK) you at least need access to m_choices if you
+//                wish to override this class
+protected:
+    wxString        m_startValue;
+    wxArrayString   m_choices;
+    bool            m_allowOthers;
+
+    DECLARE_NO_COPY_CLASS(wxGridCellChoiceEditor)
+};
+
+#endif // wxUSE_COMBOBOX
+

 // ----------------------------------------------------------------------------
 // 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().
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // 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
+class WXDLLIMPEXP_ADV wxGridCellAttr : public wxClientDataContainer

 {
 public:
 {
 public:

+    enum wxAttrKind
+    {
+        Any,
+        Default,
+        Cell,
+        Row,
+        Col,
+        Merged
+    };
+

     // ctors
     // ctors

-    wxGridCellAttr()
+    wxGridCellAttr(wxGridCellAttr *attrDefault = NULL)

     {
     {

-        Init();
-        SetAlignment(0, 0);
+        Init(attrDefault);
+
+        // MB: args used to be 0,0 here but wxALIGN_LEFT is 0
+        SetAlignment(-1, -1);

     }
 
     // VZ: considering the number of members wxGridCellAttr has now, this ctor
     }
 
     // VZ: considering the number of members wxGridCellAttr has now, this ctor


@@ -269,15 +648,15 @@ public:
         SetAlignment(hAlign, vAlign);
     }
 
         SetAlignment(hAlign, vAlign);
     }
 

-    // default copy ctor ok
+    // creates a new copy of this object
+    wxGridCellAttr *Clone() const;
+    void MergeWith(wxGridCellAttr *mergefrom);

 
     // 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; }
 
     // 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; }
 
     // setters
     void SetTextColour(const wxColour& colText) { m_colText = colText; }


@@ -288,47 +667,73 @@ public:
         m_hAlign = hAlign;
         m_vAlign = vAlign;
     }
         m_hAlign = hAlign;
         m_vAlign = vAlign;
     }

-    void SetReadOnly(bool isReadOnly = TRUE) { m_isReadOnly = isReadOnly; }
+    void SetSize(int num_rows, int num_cols);
+    void SetOverflow(bool allow = true)
+        { m_overflow = allow ? Overflow : SingleCell; }
+    void SetReadOnly(bool isReadOnly = true)
+        { m_isReadOnly = isReadOnly ? ReadOnly : ReadWrite; }

 
     // takes ownership of the pointer
     void SetRenderer(wxGridCellRenderer *renderer)
 
     // takes ownership of the pointer
     void SetRenderer(wxGridCellRenderer *renderer)

-        { delete m_renderer; m_renderer = renderer; }
+        { wxSafeDecRef(m_renderer); m_renderer = renderer; }

     void SetEditor(wxGridCellEditor* editor)
     void SetEditor(wxGridCellEditor* editor)

-        { delete m_editor; m_editor = editor; }
+        { wxSafeDecRef(m_editor); m_editor = editor; }
+
+    void SetKind(wxAttrKind kind) { m_attrkind = kind; }

 
     // accessors
     bool HasTextColour() const { return m_colText.Ok(); }
     bool HasBackgroundColour() const { return m_colBack.Ok(); }
     bool HasFont() const { return m_font.Ok(); }
 
     // 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 HasAlignment() const { return (m_hAlign != -1 || m_vAlign != -1); }

     bool HasRenderer() const { return m_renderer != NULL; }
     bool HasEditor() const { return m_editor != NULL; }
     bool HasRenderer() const { return m_renderer != NULL; }
     bool HasEditor() const { return m_editor != NULL; }

+    bool HasReadWriteMode() const { return m_isReadOnly != Unset; }
+    bool HasOverflowMode() const { return m_overflow != UnsetOverflow; }
+    bool HasSize() const { return m_sizeRows != 1 || m_sizeCols != 1; }

 
     const wxColour& GetTextColour() const;
     const wxColour& GetBackgroundColour() const;
     const wxFont& GetFont() const;
     void GetAlignment(int *hAlign, int *vAlign) const;
 
     const wxColour& GetTextColour() const;
     const wxColour& GetBackgroundColour() const;
     const wxFont& GetFont() const;
     void GetAlignment(int *hAlign, int *vAlign) const;

-    wxGridCellRenderer *GetRenderer() const;
-    wxGridCellEditor *GetEditor() const;
+    void GetSize(int *num_rows, int *num_cols) const;
+    bool GetOverflow() const
+        { return m_overflow != SingleCell; }
+    wxGridCellRenderer *GetRenderer(wxGrid* grid, int row, int col) const;
+    wxGridCellEditor *GetEditor(wxGrid* grid, int row, int col) const;

 
 

-    bool IsReadOnly() const { return m_isReadOnly; }
+    bool IsReadOnly() const { return m_isReadOnly == wxGridCellAttr::ReadOnly; }
+
+    wxAttrKind GetKind() { return m_attrkind; }

 
     void SetDefAttr(wxGridCellAttr* defAttr) { m_defGridAttr = defAttr; }
 
 
     void SetDefAttr(wxGridCellAttr* defAttr) { m_defGridAttr = defAttr; }
 

+protected:
+    // the dtor is private because only DecRef() can delete us
+    virtual ~wxGridCellAttr()
+    {
+        wxSafeDecRef(m_renderer);
+        wxSafeDecRef(m_editor);
+    }
+

 private:
 private:

-    // the common part of all ctors
-    void Init()
+    enum wxAttrReadMode

     {
     {

-        m_nRef = 1;
+        Unset = -1,
+        ReadWrite,
+        ReadOnly
+    };

 
 

-        m_isReadOnly = FALSE;
+    enum wxAttrOverflowMode
+    {
+        UnsetOverflow = -1,
+        Overflow,
+        SingleCell
+    };

 
 

-        m_renderer = NULL;
-        m_editor = NULL;
-    }
+    // the common part of all ctors
+    void Init(wxGridCellAttr *attrDefault = NULL);

 
 

-    // the dtor is private because only DecRef() can delete us
-    ~wxGridCellAttr() { delete m_renderer; delete m_editor; }

 
     // the ref count - when it goes to 0, we die
     size_t   m_nRef;
 
     // the ref count - when it goes to 0, we die
     size_t   m_nRef;


@@ -338,12 +743,21 @@ private:
     wxFont   m_font;
     int      m_hAlign,
              m_vAlign;
     wxFont   m_font;
     int      m_hAlign,
              m_vAlign;

+    int      m_sizeRows,
+             m_sizeCols;
+
+    wxAttrOverflowMode  m_overflow;

 
     wxGridCellRenderer* m_renderer;
     wxGridCellEditor*   m_editor;
     wxGridCellAttr*     m_defGridAttr;
 
 
     wxGridCellRenderer* m_renderer;
     wxGridCellEditor*   m_editor;
     wxGridCellAttr*     m_defGridAttr;
 

-    bool m_isReadOnly;
+    wxAttrReadMode m_isReadOnly;
+
+    wxAttrKind m_attrkind;
+
+    // use Clone() instead
+    DECLARE_NO_COPY_CLASS(wxGridCellAttr)

 
     // suppress the stupid gcc warning about the class having private dtor and
     // no friends
 
     // suppress the stupid gcc warning about the class having private dtor and
     // no friends


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

-class WXDLLEXPORT wxGridCellAttrProvider
+class WXDLLIMPEXP_ADV wxGridCellAttrProvider : public wxClientDataContainer

 {
 public:
     wxGridCellAttrProvider();
     virtual ~wxGridCellAttrProvider();
 
     // DecRef() must be called on the returned pointer
 {
 public:
     wxGridCellAttrProvider();
     virtual ~wxGridCellAttrProvider();
 
     // DecRef() must be called on the returned pointer

-    virtual wxGridCellAttr *GetAttr(int row, int col) const;
+    virtual wxGridCellAttr *GetAttr(int row, int col,
+                                    wxGridCellAttr::wxAttrKind  kind ) const;

 
     // all these functions take ownership of the pointer, don't call DecRef()
     // on it
 
     // all these functions take ownership of the pointer, don't call DecRef()
     // on it


@@ -386,6 +801,8 @@ private:
     void InitData();
 
     wxGridCellAttrProviderData *m_data;
     void InitData();
 
     wxGridCellAttrProviderData *m_data;

+
+    DECLARE_NO_COPY_CLASS(wxGridCellAttrProvider)

 };
 
 //////////////////////////////////////////////////////////////////////
 };
 
 //////////////////////////////////////////////////////////////////////


@@ -395,7 +812,7 @@ private:
 //////////////////////////////////////////////////////////////////////
 
 
 //////////////////////////////////////////////////////////////////////
 
 

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

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


@@ -403,11 +820,29 @@ public:
 
     // You must override these functions in a derived table class
     //
 
     // You must override these functions in a derived table class
     //

-    virtual long GetNumberRows() = 0;
-    virtual long GetNumberCols() = 0;
-    virtual wxString GetValue( int row, int col ) = 0;
-    virtual void SetValue( int row, int col, const wxString& s ) = 0;
+    virtual int GetNumberRows() = 0;
+    virtual int GetNumberCols() = 0;

     virtual bool IsEmptyCell( int row, int col ) = 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& value ) = 0;
+
+    // Data type determination and value access
+    virtual wxString GetTypeName( int row, int col );
+    virtual bool CanGetValueAs( int row, int col, const wxString& typeName );
+    virtual bool CanSetValueAs( int row, int col, const wxString& typeName );
+
+    virtual long GetValueAsLong( int row, int col );
+    virtual double GetValueAsDouble( int row, int col );
+    virtual bool GetValueAsBool( int row, int col );
+
+    virtual void SetValueAsLong( int row, int col, long value );
+    virtual void SetValueAsDouble( int row, int col, double value );
+    virtual void SetValueAsBool( int row, int col, bool value );
+
+    // For user defined types
+    virtual void* GetValueAsCustom( int row, int col, const wxString& typeName );
+    virtual void  SetValueAsCustom( int row, int col, const wxString& typeName, void* value );
+

 
     // Overriding these is optional
     //
 
     // Overriding these is optional
     //


@@ -436,13 +871,15 @@ public:
     // get the currently used attr provider (may be NULL)
     wxGridCellAttrProvider *GetAttrProvider() const { return m_attrProvider; }
 
     // get the currently used attr provider (may be NULL)
     wxGridCellAttrProvider *GetAttrProvider() const { return m_attrProvider; }
 

-    // change row/col number in attribute if needed
-    void UpdateAttrRows( size_t pos, int numRows );
-    void UpdateAttrCols( size_t pos, int numCols );
+    // Does this table allow attributes?  Default implementation creates
+    // a wxGridCellAttrProvider if necessary.
+    virtual bool CanHaveAttributes();

 
     // by default forwarded to wxGridCellAttrProvider if any. May be
 
     // by default forwarded to wxGridCellAttrProvider if any. May be

-    // overridden to handle attributes directly in this class.
-    virtual wxGridCellAttr *GetAttr( int row, int col );
+    // overridden to handle attributes directly in the table.
+    virtual wxGridCellAttr *GetAttr( int row, int col,
+                                     wxGridCellAttr::wxAttrKind  kind );
+

 
     // these functions take ownership of the pointer
     virtual void SetAttr(wxGridCellAttr* attr, int row, int col);
 
     // these functions take ownership of the pointer
     virtual void SetAttr(wxGridCellAttr* attr, int row, int col);


@@ -453,7 +890,8 @@ private:
     wxGrid * m_view;
     wxGridCellAttrProvider *m_attrProvider;
 
     wxGrid * m_view;
     wxGridCellAttrProvider *m_attrProvider;
 

-    DECLARE_ABSTRACT_CLASS( wxGridTableBase );
+    DECLARE_ABSTRACT_CLASS(wxGridTableBase)
+    DECLARE_NO_COPY_CLASS(wxGridTableBase)

 };
 
 
 };
 
 


@@ -475,7 +913,7 @@ enum wxGridTableRequest
     wxGRIDTABLE_NOTIFY_COLS_DELETED
 };
 
     wxGRIDTABLE_NOTIFY_COLS_DELETED
 };
 

-class WXDLLEXPORT wxGridTableMessage
+class WXDLLIMPEXP_ADV wxGridTableMessage

 {
 public:
     wxGridTableMessage();
 {
 public:
     wxGridTableMessage();


@@ -497,6 +935,8 @@ private:
     int m_id;
     int m_comInt1;
     int m_comInt2;
     int m_id;
     int m_comInt1;
     int m_comInt2;

+
+    DECLARE_NO_COPY_CLASS(wxGridTableMessage)

 };
 
 
 };
 
 


@@ -505,7 +945,8 @@ private:
 // A 2-dimensional array of strings for data values
 //
 
 // A 2-dimensional array of strings for data values
 //
 

-WX_DECLARE_EXPORTED_OBJARRAY(wxArrayString, wxGridStringArray);
+WX_DECLARE_OBJARRAY_WITH_DECL(wxArrayString, wxGridStringArray,
+                              class WXDLLIMPEXP_ADV);

 
 
 
 
 
 


@@ -515,17 +956,17 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxArrayString, wxGridStringArray);
 // that are stored in memory
 //
 
 // that are stored in memory
 //
 

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

 {
 public:
     wxGridStringTable();
     wxGridStringTable( int numRows, int numCols );
 {
 public:
     wxGridStringTable();
     wxGridStringTable( int numRows, int numCols );

-    ~wxGridStringTable();
+    virtual ~wxGridStringTable();

 
     // these are pure virtual in wxGridTableBase
     //
 
     // these are pure virtual in wxGridTableBase
     //

-    long GetNumberRows();
-    long GetNumberCols();
+    int GetNumberRows();
+    int GetNumberCols();

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


@@ -554,18 +995,20 @@ private:
     wxArrayString     m_rowLabels;
     wxArrayString     m_colLabels;
 
     wxArrayString     m_rowLabels;
     wxArrayString     m_colLabels;
 

-    DECLARE_DYNAMIC_CLASS( wxGridStringTable )
+    DECLARE_DYNAMIC_CLASS_NO_COPY( wxGridStringTable )

 };
 
 
 
 };
 
 
 

-//////////////////////////////////////////////////////////////////////
-//
+// ============================================================================

 //  Grid view classes
 //  Grid view classes

-//
-//////////////////////////////////////////////////////////////////////
+// ============================================================================

 
 

-class WXDLLEXPORT wxGridCellCoords
+// ----------------------------------------------------------------------------
+// wxGridCellCoords: location of a cell in the grid
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_ADV wxGridCellCoords

 {
 public:
     wxGridCellCoords() { m_row = m_col = -1; }
 {
 public:
     wxGridCellCoords() { m_row = m_col = -1; }


@@ -573,11 +1016,11 @@ public:
 
     // default copy ctor is ok
 
 
     // default copy ctor is ok
 

-    long GetRow() const { return m_row; }
-    void SetRow( long n ) { m_row = n; }
-    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; }
+    int GetRow() const { return m_row; }
+    void SetRow( int n ) { m_row = n; }
+    int GetCol() const { return m_col; }
+    void SetCol( int n ) { m_col = n; }
+    void Set( int row, int col ) { m_row = row; m_col = col; }

 
     wxGridCellCoords& operator=( const wxGridCellCoords& other )
     {
 
     wxGridCellCoords& operator=( const wxGridCellCoords& other )
     {


@@ -605,45 +1048,56 @@ public:
     }
 
 private:
     }
 
 private:

-    long m_row;
-    long m_col;
+    int m_row;
+    int m_col;

 };
 
 
 // For comparisons...
 //
 };
 
 
 // For comparisons...
 //

-extern wxGridCellCoords wxGridNoCellCoords;
-extern wxRect           wxGridNoCellRect;
+extern WXDLLIMPEXP_ADV wxGridCellCoords wxGridNoCellCoords;
+extern WXDLLIMPEXP_ADV wxRect           wxGridNoCellRect;

 
 // An array of cell coords...
 //
 
 // An array of cell coords...
 //

-WX_DECLARE_EXPORTED_OBJARRAY(wxGridCellCoords, wxGridCellCoordsArray);
-
-
+WX_DECLARE_OBJARRAY_WITH_DECL(wxGridCellCoords, wxGridCellCoordsArray,
+                              class WXDLLIMPEXP_ADV);

 
 // ----------------------------------------------------------------------------
 // wxGrid
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxGrid
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGrid : public wxScrolledWindow
+class WXDLLIMPEXP_ADV wxGrid : public wxScrolledWindow

 {
 public:
 {
 public:

-    wxGrid()
-        {
-            Create();
-        }
+    wxGrid() ;

 
 

-    wxGrid( wxWindow *parent,
+        wxGrid( wxWindow *parent,

             wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,

-            long style = 0,
+            long style = wxWANTS_CHARS,

             const wxString& name = wxPanelNameStr );
 
             const wxString& name = wxPanelNameStr );
 

-    ~wxGrid();
+    bool Create( wxWindow *parent,
+            wxWindowID id,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            long style = wxWANTS_CHARS,
+            const wxString& name = wxPanelNameStr );
+
+    virtual ~wxGrid();

 
 

-    bool CreateGrid( int numRows, int numCols );
+    enum wxGridSelectionModes {wxGridSelectCells,
+                               wxGridSelectRows,
+                               wxGridSelectColumns};

 
 

+    bool CreateGrid( int numRows, int numCols,
+                     wxGrid::wxGridSelectionModes selmode =
+                     wxGrid::wxGridSelectCells );
+
+    void SetSelectionMode(wxGrid::wxGridSelectionModes selmode);
+    wxGrid::wxGridSelectionModes GetSelectionMode() const;

 
     // ------ grid dimensions
     //
 
     // ------ grid dimensions
     //


@@ -653,10 +1107,10 @@ public:
 
     // ------ display update functions
     //
 
     // ------ display update functions
     //

-    void CalcRowLabelsExposed( wxRegion& reg );
+    wxArrayInt CalcRowLabelsExposed( const wxRegion& reg );

 
 

-    void CalcColLabelsExposed( wxRegion& reg );
-    void CalcCellsExposed( wxRegion& reg );
+    wxArrayInt CalcColLabelsExposed( const wxRegion& reg );
+    wxGridCellCoordsArray CalcCellsExposed( const wxRegion& reg );

 
 
     // ------ event handlers
 
 
     // ------ event handlers


@@ -671,46 +1125,56 @@ public:
     void DoEndDragResizeCol();
 
     wxGridTableBase * GetTable() const { return m_table; }
     void DoEndDragResizeCol();
 
     wxGridTableBase * GetTable() const { return m_table; }

-    bool SetTable( wxGridTableBase *table, bool takeOwnership=FALSE );
+    bool SetTable( wxGridTableBase *table, bool takeOwnership = false,
+                   wxGrid::wxGridSelectionModes selmode =
+                   wxGrid::wxGridSelectCells );

 
     void ClearGrid();
 
     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 );
+    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 , const wxGridCellCoordsArray& cells );
+    void DrawGridSpace( wxDC& dc );

     void DrawCellBorder( wxDC& dc, const wxGridCellCoords& );
     void DrawAllGridLines( wxDC& dc, const wxRegion & reg );
     void DrawCell( wxDC& dc, const wxGridCellCoords& );
     void DrawCellBorder( wxDC& dc, const wxGridCellCoords& );
     void DrawAllGridLines( wxDC& dc, const wxRegion & reg );
     void DrawCell( wxDC& dc, const wxGridCellCoords& );

-    void DrawHighlight(wxDC& dc);
+    void DrawHighlight(wxDC& dc, const wxGridCellCoordsArray& cells);

 
     // this function is called when the current cell highlight must be redrawn
     // and may be overridden by the user
     virtual void DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr );
 
 
     // this function is called when the current cell highlight must be redrawn
     // and may be overridden by the user
     virtual void DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr );
 

-    void DrawRowLabels( wxDC& dc );
-    void DrawRowLabel( wxDC& dc, int row );
+    virtual void DrawRowLabels( wxDC& dc, const wxArrayInt& rows );
+    virtual void DrawRowLabel( wxDC& dc, int row );

 
 

-    void DrawColLabels( wxDC& dc );
-    void DrawColLabel( wxDC& dc, int col );
+    virtual void DrawColLabels( wxDC& dc, const wxArrayInt& cols );
+    virtual void DrawColLabel( wxDC& dc, int col );

 
 
     // ------ Cell text drawing functions
     //
     void DrawTextRectangle( wxDC& dc, const wxString&, const wxRect&,
 
 
     // ------ Cell text drawing functions
     //
     void DrawTextRectangle( wxDC& dc, const wxString&, const wxRect&,

-                            int horizontalAlignment = wxLEFT,
-                            int verticalAlignment = wxTOP );
+                            int horizontalAlignment = wxALIGN_LEFT,
+                            int verticalAlignment = wxALIGN_TOP,
+                            int textOrientation = wxHORIZONTAL );
+
+    void DrawTextRectangle( wxDC& dc, const wxArrayString& lines, const wxRect&,
+                            int horizontalAlignment = wxALIGN_LEFT,
+                            int verticalAlignment = wxALIGN_TOP,
+                            int textOrientation = wxHORIZONTAL );
+

 
     // Split a string containing newline chararcters into an array of
     // strings and return the number of lines
     //
     void StringToLines( const wxString& value, wxArrayString& lines );
 
 
     // Split a string containing newline chararcters into an array of
     // strings and return the number of lines
     //
     void StringToLines( const wxString& value, wxArrayString& lines );
 

-    void GetTextBoxSize( wxDC& dc,
-                         wxArrayString& lines,
+    void GetTextBoxSize( const wxDC& dc,
+                         const wxArrayString& lines,

                          long *width, long *height );
 
 
                          long *width, long *height );
 
 


@@ -720,25 +1184,38 @@ public:
     // flicker
     //
     void     BeginBatch() { m_batchCount++; }
     // flicker
     //
     void     BeginBatch() { m_batchCount++; }

-    void     EndBatch() { if ( m_batchCount > 0 ) m_batchCount--; }
+    void     EndBatch();
+

     int      GetBatchCount() { return m_batchCount; }
 
     int      GetBatchCount() { return m_batchCount; }
 

+    virtual void Refresh(bool eraseb = true,
+                         const wxRect* rect = (const wxRect *)  NULL);
+
+    // Use this, rather than wxWindow::Refresh(), to force an
+    // immediate repainting of the grid. Has no effect if you are
+    // already inside a BeginBatch / EndBatch block.
+    //
+    // This function is necessary because wxGrid has a minimal OnPaint()
+    // handler to reduce screen flicker.
+    //
+    void     ForceRefresh();
+

 
     // ------ edit control functions
     //
 
     // ------ edit control functions
     //

-    bool IsEditable() { return m_editable; }
+    bool IsEditable() const { return m_editable; }

     void EnableEditing( bool edit );
 
     void EnableEditing( bool edit );
 

-    void EnableCellEditControl( bool enable = TRUE );
-    void DisableCellEditControl() { EnableCellEditControl(FALSE); }
+    void EnableCellEditControl( bool enable = true );
+    void DisableCellEditControl() { EnableCellEditControl(false); }

     bool CanEnableCellControl() const;
     bool IsCellEditControlEnabled() const;
     bool CanEnableCellControl() const;
     bool IsCellEditControlEnabled() const;

+    bool IsCellEditControlShown() const;

 
     bool IsCurrentCellReadOnly() const;
 
     void ShowCellEditControl();
     void HideCellEditControl();
 
     bool IsCurrentCellReadOnly() const;
 
     void ShowCellEditControl();
     void HideCellEditControl();

-    void SetEditControlValue( const wxString& s = wxEmptyString );

     void SaveEditControlValue();
 
 
     void SaveEditControlValue();
 
 


@@ -764,8 +1241,8 @@ public:
     // 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
     //

-    bool IsVisible( int row, int col, bool wholeCellVisible = TRUE );
-    bool IsVisible( const wxGridCellCoords& coords, bool wholeCellVisible = TRUE )
+    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 )
         { return IsVisible( coords.GetRow(), coords.GetCol(), wholeCellVisible ); }
     void MakeCellVisible( int row, int col );
     void MakeCellVisible( const wxGridCellCoords& coords )


@@ -777,16 +1254,16 @@ public:
     void SetGridCursor( int row, int col )
         { SetCurrentCell( wxGridCellCoords(row, col) ); }
 
     void SetGridCursor( int row, int col )
         { SetCurrentCell( wxGridCellCoords(row, col) ); }
 

-    bool MoveCursorUp();
-    bool MoveCursorDown();
-    bool MoveCursorLeft();
-    bool MoveCursorRight();
+    bool MoveCursorUp( bool expandSelection );
+    bool MoveCursorDown( bool expandSelection );
+    bool MoveCursorLeft( bool expandSelection );
+    bool MoveCursorRight( bool expandSelection );

     bool MovePageDown();
     bool MovePageUp();
     bool MovePageDown();
     bool MovePageUp();

-    bool MoveCursorUpBlock();
-    bool MoveCursorDownBlock();
-    bool MoveCursorLeftBlock();
-    bool MoveCursorRightBlock();
+    bool MoveCursorUpBlock( bool expandSelection );
+    bool MoveCursorDownBlock( bool expandSelection );
+    bool MoveCursorLeftBlock( bool expandSelection );
+    bool MoveCursorRightBlock( bool expandSelection );

 
 
     // ------ label and gridline formatting
 
 
     // ------ label and gridline formatting


@@ -800,9 +1277,13 @@ public:
     wxFont   GetLabelFont() { return m_labelFont; }
     void     GetRowLabelAlignment( int *horiz, int *vert );
     void     GetColLabelAlignment( int *horiz, int *vert );
     wxFont   GetLabelFont() { return m_labelFont; }
     void     GetRowLabelAlignment( int *horiz, int *vert );
     void     GetColLabelAlignment( int *horiz, int *vert );

+    int      GetColLabelTextOrientation();

     wxString GetRowLabelValue( int row );
     wxString GetColLabelValue( int col );
     wxColour GetGridLineColour() { return m_gridLineColour; }
     wxString GetRowLabelValue( int row );
     wxString GetColLabelValue( int col );
     wxColour GetGridLineColour() { return m_gridLineColour; }

+    wxColour GetCellHighlightColour() { return m_cellHighlightColour; }
+    int      GetCellHighlightPenWidth() { return m_cellHighlightPenWidth; }
+    int      GetCellHighlightROPenWidth() { return m_cellHighlightROPenWidth; }

 
     void     SetRowLabelSize( int width );
     void     SetColLabelSize( int height );
 
     void     SetRowLabelSize( int width );
     void     SetColLabelSize( int height );


@@ -811,15 +1292,49 @@ public:
     void     SetLabelFont( const wxFont& );
     void     SetRowLabelAlignment( int horiz, int vert );
     void     SetColLabelAlignment( int horiz, int vert );
     void     SetLabelFont( const wxFont& );
     void     SetRowLabelAlignment( int horiz, int vert );
     void     SetColLabelAlignment( int horiz, int vert );

+    void     SetColLabelTextOrientation( int textOrientation );

     void     SetRowLabelValue( int row, const wxString& );
     void     SetColLabelValue( int col, const wxString& );
     void     SetGridLineColour( const wxColour& );
     void     SetRowLabelValue( int row, const wxString& );
     void     SetColLabelValue( int col, const wxString& );
     void     SetGridLineColour( const wxColour& );

-
-    // this sets the specified attribute for all cells in this row/col
+    void     SetCellHighlightColour( const wxColour& );
+    void     SetCellHighlightPenWidth(int width);
+    void     SetCellHighlightROPenWidth(int width);
+
+    void     EnableDragRowSize( bool enable = true );
+    void     DisableDragRowSize() { EnableDragRowSize( false ); }
+    bool     CanDragRowSize() { return m_canDragRowSize; }
+    void     EnableDragColSize( bool enable = true );
+    void     DisableDragColSize() { EnableDragColSize( false ); }
+    bool     CanDragColSize() { return m_canDragColSize; }
+    void     EnableDragGridSize(bool enable = true);
+    void     DisableDragGridSize() { EnableDragGridSize(false); }
+    bool     CanDragGridSize() { return m_canDragGridSize; }
+
+    void     EnableDragCell( bool enable = true );
+    void     DisableDragCell() { EnableDragCell( false ); }
+    bool     CanDragCell() { return m_canDragCell; }
+
+    // this sets the specified attribute for this cell or in this row/col
+    void     SetAttr(int row, int col, wxGridCellAttr *attr);

     void     SetRowAttr(int row, wxGridCellAttr *attr);
     void     SetColAttr(int col, wxGridCellAttr *attr);
 
     void     SetRowAttr(int row, wxGridCellAttr *attr);
     void     SetColAttr(int col, wxGridCellAttr *attr);
 

-    void     EnableGridLines( bool enable = TRUE );
+    // 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;
+
+
+    // shortcuts for setting the column parameters
+
+    // set the format for the data in the column: default is string
+    void     SetColFormatBool(int col);
+    void     SetColFormatNumber(int col);
+    void     SetColFormatFloat(int col, int width = -1, int precision = -1);
+    void     SetColFormatCustom(int col, const wxString& typeName);
+
+    void     EnableGridLines( bool enable = true );

     bool     GridLinesEnabled() { return m_gridLinesEnabled; }
 
     // ------ row and col formatting
     bool     GridLinesEnabled() { return m_gridLinesEnabled; }
 
     // ------ row and col formatting


@@ -836,12 +1351,59 @@ public:
     wxFont   GetCellFont( int row, int col );
     void     GetDefaultCellAlignment( int *horiz, int *vert );
     void     GetCellAlignment( int row, int col, int *horiz, int *vert );
     wxFont   GetCellFont( int row, int col );
     void     GetDefaultCellAlignment( int *horiz, int *vert );
     void     GetCellAlignment( int row, int col, int *horiz, int *vert );

+    bool     GetDefaultCellOverflow();
+    bool     GetCellOverflow( int row, int col );
+    void     GetCellSize( int row, int col, int *num_rows, int *num_cols );

 
 

-    void     SetDefaultRowSize( int height, bool resizeExistingRows = FALSE );
+    void     SetDefaultRowSize( int height, bool resizeExistingRows = false );

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

-    void     SetDefaultColSize( int width, bool resizeExistingCols = FALSE );
+    void     SetDefaultColSize( int width, bool resizeExistingCols = false );

 
     void     SetColSize( int col, int width );
 
     void     SetColSize( int col, int width );

+
+    // automatically size the column or row to fit to its contents, if
+    // setAsMin is true, this optimal width will also be set as minimal width
+    // for this column
+    void     AutoSizeColumn( int col, bool setAsMin = true )
+        { AutoSizeColOrRow(col, setAsMin, true); }
+    void     AutoSizeRow( int row, bool setAsMin = true )
+        { AutoSizeColOrRow(row, setAsMin, false); }
+
+    // auto size all columns (very ineffective for big grids!)
+    void     AutoSizeColumns( bool setAsMin = true )
+        { (void)SetOrCalcColumnSizes(false, setAsMin); }
+
+    void     AutoSizeRows( bool setAsMin = true )
+        { (void)SetOrCalcRowSizes(false, setAsMin); }
+
+    // auto size the grid, that is make the columns/rows of the "right" size
+    // and also set the grid size to just fit its contents
+    void     AutoSize();
+
+    // autosize row height depending on label text
+    void     AutoSizeRowLabelSize( int row );
+
+    // autosize column width depending on label text
+    void     AutoSizeColLabelSize( int col );
+
+    // column won't be resized to be lesser width - this must be called during
+    // the grid creation because it won't resize the column if it's already
+    // narrower than the minimal width
+    void     SetColMinimalWidth( int col, int width );
+    void     SetRowMinimalHeight( int row, int width );
+
+    /*  These members can be used to query and modify the minimal
+     *  acceptable size of grid rows and columns. Call this function in
+     *  your code which creates the grid if you want to display cells
+     *  with a size smaller than the default acceptable minimum size.
+     *  Like the members SetColMinimalWidth and SetRowMinimalWidth,
+     *  the existing rows or columns will not be checked/resized.
+     */
+    void     SetColMinimalAcceptableWidth( int width );
+    void     SetRowMinimalAcceptableHeight( int width );
+    int      GetColMinimalAcceptableWidth() const;
+    int      GetRowMinimalAcceptableHeight() const;
+

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


@@ -851,6 +1413,9 @@ public:
     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     SetCellFont( int row, int col, const wxFont& );
     void     SetDefaultCellAlignment( int horiz, int vert );
     void     SetCellAlignment( int row, int col, int horiz, int vert );

+    void     SetDefaultCellOverflow( bool allow );
+    void     SetCellOverflow( int row, int col, bool allow );
+    void     SetCellSize( int row, int col, int num_rows, int num_cols );

 
     // takes ownership of the pointer
     void SetDefaultRenderer(wxGridCellRenderer *renderer);
 
     // takes ownership of the pointer
     void SetDefaultRenderer(wxGridCellRenderer *renderer);


@@ -865,6 +1430,7 @@ public:
     wxGridCellEditor* GetCellEditor(int row, int col);
 
 
     wxGridCellEditor* GetCellEditor(int row, int col);
 
 

+

     // ------ cell value accessors
     //
     wxString GetCellValue( int row, int col )
     // ------ cell value accessors
     //
     wxString GetCellValue( int row, int col )


@@ -886,54 +1452,49 @@ public:
     void SetCellValue( const wxGridCellCoords& coords, const wxString& s )
         { SetCellValue( coords.GetRow(), coords.GetCol(), s ); }
 
     void SetCellValue( const wxGridCellCoords& coords, const wxString& s )
         { SetCellValue( coords.GetRow(), coords.GetCol(), s ); }
 

-    // returns TRUE if the cell can't be edited
+    // returns true if the cell can't be edited

     bool IsReadOnly(int row, int col) const;
 
     // make the cell editable/readonly
     bool IsReadOnly(int row, int col) const;
 
     // make the cell editable/readonly

-    void SetReadOnly(int row, int col, bool isReadOnly = TRUE);
+    void SetReadOnly(int row, int col, bool isReadOnly = true);

 
 

-    // ------ selections of blocks of cells
+    // ------ select blocks of cells

     //
     //

-    void SelectRow( int row, bool addToSelected = FALSE );
-    void SelectCol( int col, bool addToSelected = FALSE );
+    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( int topRow, int leftCol, int bottomRow, int rightCol,
+                      bool addToSelected = false );

 
     void SelectBlock( const wxGridCellCoords& topLeft,
 
     void SelectBlock( const wxGridCellCoords& topLeft,

-                      const wxGridCellCoords& bottomRight )
+                      const wxGridCellCoords& bottomRight,
+                      bool addToSelected = false )

         { SelectBlock( topLeft.GetRow(), topLeft.GetCol(),
         { SelectBlock( topLeft.GetRow(), topLeft.GetCol(),

-                       bottomRight.GetRow(), bottomRight.GetCol() ); }
+                       bottomRight.GetRow(), bottomRight.GetCol(),
+                       addToSelected ); }

 
     void SelectAll();
 
 
     void SelectAll();
 

-    bool IsSelection()
-        { return ( m_selectedTopLeft != wxGridNoCellCoords &&
-                   m_selectedBottomRight != wxGridNoCellCoords );
-        }
+    bool IsSelection();
+
+    // ------ deselect blocks or cells
+    //
+    void DeselectRow( int row );
+    void DeselectCol( int col );
+    void DeselectCell( int row, int col );

 
     void ClearSelection();
 
 
     void ClearSelection();
 

-    bool IsInSelection( int row, int col )
-        { return ( IsSelection() &&
-                   row >= m_selectedTopLeft.GetRow() &&
-                   col >= m_selectedTopLeft.GetCol() &&
-                   row <= m_selectedBottomRight.GetRow() &&
-                   col <= m_selectedBottomRight.GetCol() );
-        }
+    bool IsInSelection( int row, int col ) const;

 
 

-    bool IsInSelection( const wxGridCellCoords& coords )
+    bool IsInSelection( const wxGridCellCoords& coords ) const

         { return IsInSelection( coords.GetRow(), coords.GetCol() ); }
 
         { return IsInSelection( coords.GetRow(), coords.GetCol() ); }
 

-    void GetSelection( int* topRow, int* leftCol, int* bottomRow, int* rightCol )
-        {
-            // these will all be -1 if there is no selected block
-            //
-            *topRow    = m_selectedTopLeft.GetRow();
-            *leftCol   = m_selectedTopLeft.GetCol();
-            *bottomRow = m_selectedBottomRight.GetRow();
-            *rightCol  = m_selectedBottomRight.GetCol();
-        }
-
+    wxGridCellCoordsArray GetSelectedCells() const;
+    wxGridCellCoordsArray GetSelectionBlockTopLeft() const;
+    wxGridCellCoordsArray GetSelectionBlockBottomRight() const;
+    wxArrayInt GetSelectedRows() const;
+    wxArrayInt GetSelectedCols() const;

 
     // This function returns the rectangle that encloses the block of cells
     // limited by TopLeft and BottomRight cell in device coords and clipped
 
     // This function returns the rectangle that encloses the block of cells
     // limited by TopLeft and BottomRight cell in device coords and clipped


@@ -942,15 +1503,6 @@ public:
     wxRect BlockToDeviceRect( const wxGridCellCoords & topLeft,
                               const wxGridCellCoords & bottomRight );
 
     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; }
     // Access or update the selection fore/back colours
     wxColour GetSelectionBackground() const
         { return m_selectionBackground; }


@@ -961,6 +1513,55 @@ public:
     void SetSelectionForeground(const wxColour& c) { m_selectionForeground = c; }
 
 
     void SetSelectionForeground(const wxColour& c) { m_selectionForeground = c; }
 
 

+    // Methods for a registry for mapping data types to Renderers/Editors
+    void RegisterDataType(const wxString& typeName,
+                          wxGridCellRenderer* renderer,
+                          wxGridCellEditor* editor);
+    // DJC MAPTEK
+    virtual wxGridCellEditor* GetDefaultEditorForCell(int row, int col) const;
+    wxGridCellEditor* GetDefaultEditorForCell(const wxGridCellCoords& c) const
+        { return GetDefaultEditorForCell(c.GetRow(), c.GetCol()); }
+    virtual wxGridCellRenderer* GetDefaultRendererForCell(int row, int col) const;
+    virtual wxGridCellEditor* GetDefaultEditorForType(const wxString& typeName) const;
+    virtual wxGridCellRenderer* GetDefaultRendererForType(const wxString& typeName) const;
+
+    // grid may occupy more space than needed for its rows/columns, this
+    // function allows to set how big this extra space is
+    void SetMargins(int extraWidth, int extraHeight)
+    {
+        m_extraWidth = extraWidth;
+        m_extraHeight = extraHeight;
+
+        CalcDimensions();
+    }
+
+    // Accessors for component windows
+    wxWindow* GetGridWindow()            { return (wxWindow*)m_gridWin; }
+    wxWindow* GetGridRowLabelWindow()    { return (wxWindow*)m_rowLabelWin; }
+    wxWindow* GetGridColLabelWindow()    { return (wxWindow*)m_colLabelWin; }
+    wxWindow* GetGridCornerLabelWindow() { return (wxWindow*)m_cornerLabelWin; }
+
+    // Allow adjustment of scroll increment. The default is (15, 15).
+    void SetScrollLineX(int x) { m_scrollLineX = x; }
+    void SetScrollLineY(int y) { m_scrollLineY = y; }
+    int GetScrollLineX() const { return m_scrollLineX; }
+    int GetScrollLineY() const { return m_scrollLineY; }
+
+    // Implementation
+    int GetScrollX(int x) const
+    {
+        return (x + GetScrollLineX() - 1) / GetScrollLineX();
+    }
+
+    int GetScrollY(int y) const
+    {
+        return (y + GetScrollLineY() - 1) / GetScrollLineY();
+    }
+
+
+    // override some base class functions
+    virtual bool Enable(bool enable = true);
+

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


@@ -972,10 +1573,11 @@ public:
     //
 
     wxGrid( wxWindow *parent,
     //
 
     wxGrid( wxWindow *parent,

-            int x = -1, int y = -1, int w = -1, int h = -1,
-            long style = 0,
+            int x, int y, int w = wxDefaultCoord, int h = wxDefaultCoord,
+            long style = wxWANTS_CHARS,

             const wxString& name = wxPanelNameStr )
             const wxString& name = wxPanelNameStr )

-        : wxScrolledWindow( parent, -1, wxPoint(x,y), wxSize(w,h), style, name )
+        : wxScrolledWindow( parent, wxID_ANY, wxPoint(x,y), wxSize(w,h),
+                            (style|wxWANTS_CHARS), name )

         {
             Create();
         }
         {
             Create();
         }


@@ -994,8 +1596,8 @@ public:
     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 SetScrollX( int WXUNUSED(x) ) { }
+    void SetScrollY( int WXUNUSED(y) ) { }

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


@@ -1006,8 +1608,7 @@ public:
     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 ); }
+    // GetRowHeight() is below

 
     int GetViewHeight() // returned num whole rows visible
         { return 0; }
 
     int GetViewHeight() // returned num whole rows visible
         { return 0; }


@@ -1095,18 +1696,18 @@ public:
         { SetCellBackgroundColour( row, col, colour ); }
 
     bool GetEditable() { return IsEditable(); }
         { SetCellBackgroundColour( row, col, colour ); }
 
     bool GetEditable() { return IsEditable(); }

-    void SetEditable( bool edit = TRUE ) { EnableEditing( edit ); }
+    void SetEditable( bool edit = true ) { EnableEditing( edit ); }

     bool GetEditInPlace() { return IsCellEditControlEnabled(); }
 
     bool GetEditInPlace() { return IsCellEditControlEnabled(); }
 

-    void SetEditInPlace(bool edit = TRUE) { }
+    void SetEditInPlace(bool WXUNUSED(edit) = true) { }

 
     void SetCellAlignment( int align, int row, int col)
 
     void SetCellAlignment( int align, int row, int col)

-    { SetCellAlignment(row, col, align, wxCENTER); }
+    { SetCellAlignment(row, col, align, wxALIGN_CENTER); }

     void SetCellAlignment( int WXUNUSED(align) ) {}
     void SetCellBitmap(wxBitmap *WXUNUSED(bitmap), int WXUNUSED(row), int WXUNUSED(col))
     { }
     void SetDividerPen(const wxPen& WXUNUSED(pen)) { }
     void SetCellAlignment( int WXUNUSED(align) ) {}
     void SetCellBitmap(wxBitmap *WXUNUSED(bitmap), int WXUNUSED(row), int WXUNUSED(col))
     { }
     void SetDividerPen(const wxPen& WXUNUSED(pen)) { }

-    wxPen& GetDividerPen() const { return wxNullPen; }
+    wxPen& GetDividerPen() const;

     void OnActivate(bool WXUNUSED(active)) {}
 
     // ******** End of compatibility functions **********
     void OnActivate(bool WXUNUSED(active)) {}
 
     // ******** End of compatibility functions **********


@@ -1123,12 +1724,13 @@ public:
            wxGRID_CHOICE,
            wxGRID_COMBOBOX };
 
            wxGRID_CHOICE,
            wxGRID_COMBOBOX };
 

-    // for wxGridCellBoolEditor
-    wxWindow *GetGridWindow() const;
+    // overridden wxWindow methods
+    virtual void Fit();

 
 protected:
 
 protected:

+    virtual wxSize DoGetBestSize() const;
+

     bool m_created;
     bool m_created;

-    bool m_displayed;

 
     wxGridWindow             *m_gridWin;
     wxGridRowLabelWindow     *m_rowLabelWin;
 
     wxGridWindow             *m_gridWin;
     wxGridRowLabelWindow     *m_rowLabelWin;


@@ -1138,31 +1740,57 @@ protected:
     wxGridTableBase          *m_table;
     bool                      m_ownTable;
 
     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;
 
     int m_numRows;
     int m_numCols;
 
     wxGridCellCoords m_currentCellCoords;
 

-    wxGridCellCoords m_selectedTopLeft;
-    wxGridCellCoords m_selectedBottomRight;
+    wxGridCellCoords m_selectingTopLeft;
+    wxGridCellCoords m_selectingBottomRight;
+    wxGridCellCoords m_selectingKeyboard;
+    wxGridSelection  *m_selection;

     wxColour    m_selectionBackground;
     wxColour    m_selectionForeground;
 
     wxColour    m_selectionBackground;
     wxColour    m_selectionForeground;
 

+    // NB: *never* access m_row/col arrays directly because they are created
+    //     on demand, *always* use accessor functions instead!
+
+    // init the m_rowHeights/Bottoms arrays with default values
+    void InitRowHeights();
+

     int        m_defaultRowHeight;
     int        m_defaultRowHeight;

+    int        m_minAcceptableRowHeight;

     wxArrayInt m_rowHeights;
     wxArrayInt m_rowBottoms;
 
     wxArrayInt m_rowHeights;
     wxArrayInt m_rowBottoms;
 

+    // init the m_colWidths/Rights arrays
+    void InitColWidths();
+

     int        m_defaultColWidth;
     int        m_defaultColWidth;

+    int        m_minAcceptableColWidth;

     wxArrayInt m_colWidths;
     wxArrayInt m_colRights;
     wxArrayInt m_colWidths;
     wxArrayInt m_colRights;

+
+    // get the col/row coords
+    int GetColWidth(int col) const;
+    int GetColLeft(int col) const;
+    int GetColRight(int col) const;
+
+    // this function must be public for compatibility...
+public:
+    int GetRowHeight(int row) const;
+protected:
+
+    int GetRowTop(int row) const;
+    int GetRowBottom(int row) const;
+

     int m_rowLabelWidth;
     int m_colLabelHeight;
 
     int m_rowLabelWidth;
     int m_colLabelHeight;
 

+    // the size of the margin left to the right and bottom of the cell area
+    int m_extraWidth,
+        m_extraHeight;
+

     wxColour   m_labelBackgroundColour;
     wxColour   m_labelTextColour;
     wxFont     m_labelFont;
     wxColour   m_labelBackgroundColour;
     wxColour   m_labelTextColour;
     wxFont     m_labelFont;


@@ -1171,23 +1799,37 @@ protected:
     int        m_rowLabelVertAlign;
     int        m_colLabelHorizAlign;
     int        m_colLabelVertAlign;
     int        m_rowLabelVertAlign;
     int        m_colLabelHorizAlign;
     int        m_colLabelVertAlign;

+    int        m_colLabelTextOrientation;

 
     bool       m_defaultRowLabelValues;
     bool       m_defaultColLabelValues;
 
     wxColour   m_gridLineColour;
     bool       m_gridLinesEnabled;
 
     bool       m_defaultRowLabelValues;
     bool       m_defaultColLabelValues;
 
     wxColour   m_gridLineColour;
     bool       m_gridLinesEnabled;

+    wxColour   m_cellHighlightColour;
+    int        m_cellHighlightPenWidth;
+    int        m_cellHighlightROPenWidth;
+
+
+    // common part of AutoSizeColumn/Row() and GetBestSize()
+    int SetOrCalcColumnSizes(bool calcOnly, bool setAsMin = true);
+    int SetOrCalcRowSizes(bool calcOnly, bool setAsMin = true);
+
+    // common part of AutoSizeColumn/Row()
+    void AutoSizeColOrRow(int n, bool setAsMin, bool column /* or row? */);

 
 

+    // if a column has a minimal width, it will be the value for it in this
+    // hash table
+    wxLongToLongHashMap m_colMinWidths,
+                        m_rowMinHeights;
+
+    // get the minimal width of the given column/row
+    int GetColMinimalWidth(int col) const;
+    int GetRowMinimalHeight(int col) const;

 
     // do we have some place to store attributes in?
     bool CanHaveAttributes();
 
 
     // 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
     // cell attribute cache (currently we only cache 1, may be will do
     // more/better later)
     struct CachedAttr


@@ -1202,7 +1844,7 @@ protected:
     // adds an attribute to cache
     void CacheAttr(int row, int col, wxGridCellAttr *attr) const;
 
     // adds an attribute to cache
     void CacheAttr(int row, int col, wxGridCellAttr *attr) const;
 

-    // looks for an attr in cache, returns TRUE if found
+    // 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
     bool LookupAttr(int row, int col, wxGridCellAttr **attr) const;
 
     // looks for the attr in cache, if not found asks the table and caches the


@@ -1215,15 +1857,12 @@ protected:
     wxGridCellAttr*     m_defaultCellAttr;
 
 
     wxGridCellAttr*     m_defaultCellAttr;
 
 

-    wxGridCellCoordsArray  m_cellsExposed;
-    wxArrayInt             m_rowsExposed;
-    wxArrayInt             m_colsExposed;
-    wxArrayInt             m_rowLabelsExposed;
-    wxArrayInt             m_colLabelsExposed;
-

     bool m_inOnKeyDown;
     int  m_batchCount;
 
     bool m_inOnKeyDown;
     int  m_batchCount;
 

+
+    wxGridTypeRegistry*    m_typeRegistry;
+

     enum CursorMode
     {
         WXGRID_CURSOR_SELECT_CELL,
     enum CursorMode
     {
         WXGRID_CURSOR_SELECT_CELL,


@@ -1234,18 +1873,22 @@ protected:
     };
 
     // this method not only sets m_cursorMode but also sets the correct cursor
     };
 
     // 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
+    // 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,
     // 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);
+                          bool captureMouse = true);

 
     wxWindow *m_winCapture;     // the window which captured the mouse
     CursorMode m_cursorMode;
 
 
     wxWindow *m_winCapture;     // the window which captured the mouse
     CursorMode m_cursorMode;
 

+    bool    m_canDragRowSize;
+    bool    m_canDragColSize;
+    bool    m_canDragGridSize;
+    bool    m_canDragCell;

     int     m_dragLastPos;
     int     m_dragRowOrCol;
     bool    m_isDragging;
     int     m_dragLastPos;
     int     m_dragRowOrCol;
     bool    m_isDragging;


@@ -1261,6 +1904,8 @@ protected:
     bool       m_editable;              // applies to whole grid
     bool       m_cellEditCtrlEnabled;   // is in-place edit currently shown?
 
     bool       m_editable;              // applies to whole grid
     bool       m_cellEditCtrlEnabled;   // is in-place edit currently shown?
 

+    int m_scrollLineX; // X scroll increment
+    int m_scrollLineY; // Y scroll increment

 
     void Create();
     void Init();
 
     void Create();
     void Init();


@@ -1269,9 +1914,9 @@ protected:
     bool Redimension( wxGridTableMessage& );
 
 
     bool Redimension( wxGridTableMessage& );
 
 

-    bool SendEvent( const wxEventType, int row, int col, wxMouseEvent& );
-    bool SendEvent( const wxEventType, int row, int col );
-    bool SendEvent( const wxEventType type)
+    int SendEvent( const wxEventType, int row, int col, wxMouseEvent& );
+    int SendEvent( const wxEventType, int row, int col );
+    int SendEvent( const wxEventType type)

     {
         return SendEvent(type,
                          m_currentCellCoords.GetRow(),
     {
         return SendEvent(type,
                          m_currentCellCoords.GetRow(),


@@ -1281,6 +1926,8 @@ protected:
     void OnPaint( wxPaintEvent& );
     void OnSize( wxSizeEvent& );
     void OnKeyDown( wxKeyEvent& );
     void OnPaint( wxPaintEvent& );
     void OnSize( wxSizeEvent& );
     void OnKeyDown( wxKeyEvent& );

+    void OnKeyUp( wxKeyEvent& );
+    void OnChar( wxKeyEvent& );

     void OnEraseBackground( wxEraseEvent& );
 
 
     void OnEraseBackground( wxEraseEvent& );
 
 


@@ -1288,41 +1935,47 @@ protected:
     void SetCurrentCell( int row, int col )
         { SetCurrentCell( wxGridCellCoords(row, col) ); }
 
     void SetCurrentCell( int row, int col )
         { SetCurrentCell( wxGridCellCoords(row, col) ); }
 

+    void HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCol );
+
+    void HighlightBlock( const wxGridCellCoords& topLeft,
+                         const wxGridCellCoords& bottomRight )
+        { HighlightBlock( topLeft.GetRow(), topLeft.GetCol(),
+                       bottomRight.GetRow(), bottomRight.GetCol() ); }

 
     // ------ functions to get/send data (see also public functions)
     //
     bool GetModelValues();
     bool SetModelValues();
 
 
     // ------ functions to get/send data (see also public functions)
     //
     bool GetModelValues();
     bool SetModelValues();
 

+    friend class WXDLLIMPEXP_ADV wxGridSelection;

 
     DECLARE_DYNAMIC_CLASS( wxGrid )
     DECLARE_EVENT_TABLE()
 
     DECLARE_DYNAMIC_CLASS( wxGrid )
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxGrid)

 };
 
 
 };
 
 

+// ----------------------------------------------------------------------------
+// Grid event class and event types
+// ----------------------------------------------------------------------------

 
 

-
-
-//
-// ------ Grid event class and event types
-//
-
-class WXDLLEXPORT wxGridEvent : public wxNotifyEvent
+class WXDLLIMPEXP_ADV wxGridEvent : public wxNotifyEvent

 {
 public:
     wxGridEvent()
         : wxNotifyEvent(), m_row(-1), m_col(-1), m_x(-1), m_y(-1),
 {
 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)
+        m_selecting(0), m_control(0), m_meta(0), m_shift(0), m_alt(0)

         {
         }
 
     wxGridEvent(int id, wxEventType type, wxObject* obj,
         {
         }
 
     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, bool alt=FALSE, bool meta=FALSE);
+                int row=-1, int col=-1, int x=-1, int y=-1, bool sel = true,
+                bool control = false, bool shift = false, bool alt = false, bool meta = false);

 
     virtual int GetRow() { return m_row; }
     virtual int GetCol() { return m_col; }
     wxPoint     GetPosition() { return wxPoint( m_x, m_y ); }
 
     virtual int GetRow() { return m_row; }
     virtual int GetCol() { return m_col; }
     wxPoint     GetPosition() { return wxPoint( m_x, m_y ); }

+    bool        Selecting() { return m_selecting; }

     bool        ControlDown() { return m_control; }
     bool        MetaDown() { return m_meta; }
     bool        ShiftDown() { return m_shift; }
     bool        ControlDown() { return m_control; }
     bool        MetaDown() { return m_meta; }
     bool        ShiftDown() { return m_shift; }


@@ -1333,15 +1986,16 @@ protected:
     int         m_col;
     int         m_x;
     int         m_y;
     int         m_col;
     int         m_x;
     int         m_y;

+    bool        m_selecting;

     bool        m_control;
     bool        m_meta;
     bool        m_shift;
     bool        m_alt;
 
     bool        m_control;
     bool        m_meta;
     bool        m_shift;
     bool        m_alt;
 

-    DECLARE_DYNAMIC_CLASS(wxGridEvent)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGridEvent)

 };
 
 };
 

-class WXDLLEXPORT wxGridSizeEvent : public wxNotifyEvent
+class WXDLLIMPEXP_ADV wxGridSizeEvent : public wxNotifyEvent

 {
 public:
     wxGridSizeEvent()
 {
 public:
     wxGridSizeEvent()


@@ -1352,7 +2006,7 @@ public:
 
     wxGridSizeEvent(int id, wxEventType type, wxObject* obj,
                 int rowOrCol=-1, int x=-1, int y=-1,
 
     wxGridSizeEvent(int id, wxEventType type, wxObject* obj,
                 int rowOrCol=-1, int x=-1, int y=-1,

-                bool control=FALSE, bool shift=FALSE, bool alt=FALSE, bool meta=FALSE);
+                bool control = false, bool shift = false, bool alt = false, bool meta = false);

 
     int         GetRowOrCol() { return m_rowOrCol; }
     wxPoint     GetPosition() { return wxPoint( m_x, m_y ); }
 
     int         GetRowOrCol() { return m_rowOrCol; }
     wxPoint     GetPosition() { return wxPoint( m_x, m_y ); }


@@ -1370,11 +2024,11 @@ protected:
     bool        m_shift;
     bool        m_alt;
 
     bool        m_shift;
     bool        m_alt;
 

-    DECLARE_DYNAMIC_CLASS(wxGridSizeEvent)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGridSizeEvent)

 };
 
 
 };
 
 

-class WXDLLEXPORT wxGridRangeSelectEvent : public wxNotifyEvent
+class WXDLLIMPEXP_ADV wxGridRangeSelectEvent : public wxNotifyEvent

 {
 public:
     wxGridRangeSelectEvent()
 {
 public:
     wxGridRangeSelectEvent()


@@ -1382,17 +2036,19 @@ public:
         {
             m_topLeft     = wxGridNoCellCoords;
             m_bottomRight = wxGridNoCellCoords;
         {
             m_topLeft     = wxGridNoCellCoords;
             m_bottomRight = wxGridNoCellCoords;

-            m_control     = FALSE;
-            m_meta        = FALSE;
-            m_shift       = FALSE;
-            m_alt         = FALSE;
+            m_selecting   = false;
+            m_control     = false;
+            m_meta        = false;
+            m_shift       = false;
+            m_alt         = false;

         }
 
     wxGridRangeSelectEvent(int id, wxEventType type, wxObject* obj,
                            const wxGridCellCoords& topLeft,
                            const wxGridCellCoords& bottomRight,
         }
 
     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);
+                           bool sel = true,
+                           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; }


@@ -1400,6 +2056,7 @@ public:
     int         GetBottomRow() { return m_bottomRight.GetRow(); }
     int         GetLeftCol()   { return m_topLeft.GetCol(); }
     int         GetRightCol()  { return m_bottomRight.GetCol(); }
     int         GetBottomRow() { return m_bottomRight.GetRow(); }
     int         GetLeftCol()   { return m_topLeft.GetCol(); }
     int         GetRightCol()  { return m_bottomRight.GetCol(); }

+    bool        Selecting() { return m_selecting; }

     bool        ControlDown()  { return m_control; }
     bool        MetaDown()     { return m_meta; }
     bool        ShiftDown()    { return m_shift; }
     bool        ControlDown()  { return m_control; }
     bool        MetaDown()     { return m_meta; }
     bool        ShiftDown()    { return m_shift; }


@@ -1408,66 +2065,145 @@ public:
 protected:
     wxGridCellCoords  m_topLeft;
     wxGridCellCoords  m_bottomRight;
 protected:
     wxGridCellCoords  m_topLeft;
     wxGridCellCoords  m_bottomRight;

+    bool              m_selecting;

     bool              m_control;
     bool              m_meta;
     bool              m_shift;
     bool              m_alt;
 
     bool              m_control;
     bool              m_meta;
     bool              m_shift;
     bool              m_alt;
 

-    DECLARE_DYNAMIC_CLASS(wxGridRangeSelectEvent)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGridRangeSelectEvent)
+};
+
+
+class WXDLLIMPEXP_ADV wxGridEditorCreatedEvent : public wxCommandEvent {
+public:
+    wxGridEditorCreatedEvent()
+        : wxCommandEvent()
+        {
+            m_row  = 0;
+            m_col  = 0;
+            m_ctrl = NULL;
+        }
+
+    wxGridEditorCreatedEvent(int id, wxEventType type, wxObject* obj,
+                             int row, int col, wxControl* ctrl);
+
+    int GetRow()                        { return m_row; }
+    int GetCol()                        { return m_col; }
+    wxControl* GetControl()             { return m_ctrl; }
+    void SetRow(int row)                { m_row = row; }
+    void SetCol(int col)                { m_col = col; }
+    void SetControl(wxControl* ctrl)    { m_ctrl = ctrl; }
+
+private:
+    int m_row;
+    int m_col;
+    wxControl* m_ctrl;
+
+    DECLARE_DYNAMIC_CLASS(wxGridEditorCreatedEvent)
+    DECLARE_NO_COPY_CLASS(wxGridEditorCreatedEvent)

 };
 
 };
 

-// TODO move to wx/event.h
-const wxEventType wxEVT_GRID_CELL_LEFT_CLICK    = wxEVT_FIRST + 1580;
-const wxEventType wxEVT_GRID_CELL_RIGHT_CLICK   = wxEVT_FIRST + 1581;
-const wxEventType wxEVT_GRID_CELL_LEFT_DCLICK   = wxEVT_FIRST + 1582;
-const wxEventType wxEVT_GRID_CELL_RIGHT_DCLICK  = wxEVT_FIRST + 1583;
-const wxEventType wxEVT_GRID_LABEL_LEFT_CLICK   = wxEVT_FIRST + 1584;
-const wxEventType wxEVT_GRID_LABEL_RIGHT_CLICK  = wxEVT_FIRST + 1585;
-const wxEventType wxEVT_GRID_LABEL_LEFT_DCLICK  = wxEVT_FIRST + 1586;
-const wxEventType wxEVT_GRID_LABEL_RIGHT_DCLICK = wxEVT_FIRST + 1587;
-const wxEventType wxEVT_GRID_ROW_SIZE           = wxEVT_FIRST + 1588;
-const wxEventType wxEVT_GRID_COL_SIZE           = wxEVT_FIRST + 1589;
-const wxEventType wxEVT_GRID_RANGE_SELECT       = wxEVT_FIRST + 1590;
-const wxEventType wxEVT_GRID_CELL_CHANGE        = wxEVT_FIRST + 1591;
-const wxEventType wxEVT_GRID_SELECT_CELL        = wxEVT_FIRST + 1592;
-const wxEventType wxEVT_GRID_EDITOR_SHOWN       = wxEVT_FIRST + 1593;
-const wxEventType wxEVT_GRID_EDITOR_HIDDEN      = wxEVT_FIRST + 1594;
+
+BEGIN_DECLARE_EVENT_TYPES()
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_LEFT_CLICK, 1580)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_RIGHT_CLICK, 1581)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_LEFT_DCLICK, 1582)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_RIGHT_DCLICK, 1583)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_LABEL_LEFT_CLICK, 1584)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_LABEL_RIGHT_CLICK, 1585)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_LABEL_LEFT_DCLICK, 1586)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_LABEL_RIGHT_DCLICK, 1587)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_ROW_SIZE, 1588)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_COL_SIZE, 1589)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_RANGE_SELECT, 1590)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_CHANGE, 1591)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_SELECT_CELL, 1592)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_EDITOR_SHOWN, 1593)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_EDITOR_HIDDEN, 1594)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_EDITOR_CREATED, 1595)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_BEGIN_DRAG, 1596)
+END_DECLARE_EVENT_TYPES()

 
 
 typedef void (wxEvtHandler::*wxGridEventFunction)(wxGridEvent&);
 typedef void (wxEvtHandler::*wxGridSizeEventFunction)(wxGridSizeEvent&);
 typedef void (wxEvtHandler::*wxGridRangeSelectEventFunction)(wxGridRangeSelectEvent&);
 
 
 typedef void (wxEvtHandler::*wxGridEventFunction)(wxGridEvent&);
 typedef void (wxEvtHandler::*wxGridSizeEventFunction)(wxGridSizeEvent&);
 typedef void (wxEvtHandler::*wxGridRangeSelectEventFunction)(wxGridRangeSelectEvent&);

-
-#define EVT_GRID_CELL_LEFT_CLICK(fn)     { wxEVT_GRID_CELL_LEFT_CLICK,    -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
-#define EVT_GRID_CELL_RIGHT_CLICK(fn)    { wxEVT_GRID_CELL_RIGHT_CLICK,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
-#define EVT_GRID_CELL_LEFT_DCLICK(fn)    { wxEVT_GRID_CELL_LEFT_DCLICK,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
-#define EVT_GRID_CELL_RIGHT_DCLICK(fn)   { wxEVT_GRID_CELL_RIGHT_DCLICK,  -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
-#define EVT_GRID_LABEL_LEFT_CLICK(fn)    { wxEVT_GRID_LABEL_LEFT_CLICK,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
-#define EVT_GRID_LABEL_RIGHT_CLICK(fn)   { wxEVT_GRID_LABEL_RIGHT_CLICK,  -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
-#define EVT_GRID_LABEL_LEFT_DCLICK(fn)   { wxEVT_GRID_LABEL_LEFT_DCLICK,  -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
-#define EVT_GRID_LABEL_RIGHT_DCLICK(fn)  { wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
-#define EVT_GRID_ROW_SIZE(fn)            { wxEVT_GRID_ROW_SIZE,           -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridSizeEventFunction) &fn, NULL },
-#define EVT_GRID_COL_SIZE(fn)            { wxEVT_GRID_COL_SIZE,           -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridSizeEventFunction) &fn, NULL },
-#define EVT_GRID_RANGE_SELECT(fn)        { wxEVT_GRID_RANGE_SELECT,       -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridRangeSelectEventFunction) &fn, NULL },
-#define EVT_GRID_CELL_CHANGE(fn)         { wxEVT_GRID_CELL_CHANGE,        -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
-#define EVT_GRID_SELECT_CELL(fn)         { wxEVT_GRID_SELECT_CELL,        -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
-#define EVT_GRID_EDITOR_SHOWN(fn)        { wxEVT_GRID_EDITOR_SHOWN,       -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
-#define EVT_GRID_EDITOR_HIDDEN(fn)       { wxEVT_GRID_EDITOR_HIDDEN,      -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
-
+typedef void (wxEvtHandler::*wxGridEditorCreatedEventFunction)(wxGridEditorCreatedEvent&);
+
+#define wxGridEventHandler(func) \
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxGridEventFunction, &func)
+
+#define wxGridSizeEventHandler(func) \
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxGridSizeEventFunction, &func)
+
+#define wxGridRangeSelectEventHandler(func) \
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxGridRangeSelectEventFunction, &func)
+
+#define wxGridEditorCreatedEventHandler(func) \
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxGridEditorCreatedEventFunction, &func)
+
+#define wx__DECLARE_GRIDEVT(evt, id, fn) \
+    wx__DECLARE_EVT1(wxEVT_GRID_ ## evt, id, wxGridEventHandler(fn))
+
+#define wx__DECLARE_GRIDSIZEEVT(evt, id, fn) \
+    wx__DECLARE_EVT1(wxEVT_GRID_ ## evt, id, wxGridSizeEventHandler(fn))
+
+#define wx__DECLARE_GRIDRANGESELEVT(evt, id, fn) \
+    wx__DECLARE_EVT1(wxEVT_GRID_ ## evt, id, wxGridRangeSelectEventHandler(fn))
+
+#define wx__DECLARE_GRIDEDITOREVT(evt, id, fn) \
+    wx__DECLARE_EVT1(wxEVT_GRID_ ## evt, id, wxGridEditorCreatedEventHandler(fn))
+
+#define EVT_GRID_CMD_CELL_LEFT_CLICK(id, fn)     wx__DECLARE_GRIDEVT(CELL_LEFT_CLICK, id, fn)
+#define EVT_GRID_CMD_CELL_RIGHT_CLICK(id, fn)    wx__DECLARE_GRIDEVT(CELL_RIGHT_CLICK, id, fn)
+#define EVT_GRID_CMD_CELL_LEFT_DCLICK(id, fn)    wx__DECLARE_GRIDEVT(CELL_LEFT_DCLICK, id, fn)
+#define EVT_GRID_CMD_CELL_RIGHT_DCLICK(id, fn)   wx__DECLARE_GRIDEVT(CELL_RIGHT_DCLICK, id, fn)
+#define EVT_GRID_CMD_LABEL_LEFT_CLICK(id, fn)    wx__DECLARE_GRIDEVT(LABEL_LEFT_CLICK, id, fn)
+#define EVT_GRID_CMD_LABEL_RIGHT_CLICK(id, fn)   wx__DECLARE_GRIDEVT(LABEL_RIGHT_CLICK, id, fn)
+#define EVT_GRID_CMD_LABEL_LEFT_DCLICK(id, fn)   wx__DECLARE_GRIDEVT(LABEL_LEFT_DCLICK, id, fn)
+#define EVT_GRID_CMD_LABEL_RIGHT_DCLICK(id, fn)  wx__DECLARE_GRIDEVT(LABEL_RIGHT_DCLICK, id, fn)
+#define EVT_GRID_CMD_ROW_SIZE(id, fn)            wx__DECLARE_GRIDSIZEEVT(ROW_SIZE, id, fn)
+#define EVT_GRID_CMD_COL_SIZE(id, fn)            wx__DECLARE_GRIDSIZEEVT(COL_SIZE, id, fn)
+#define EVT_GRID_CMD_RANGE_SELECT(id, fn)        wx__DECLARE_GRIDRANGESELEVT(RANGE_SELECT, id, fn)
+#define EVT_GRID_CMD_CELL_CHANGE(id, fn)         wx__DECLARE_GRIDEVT(CELL_CHANGE, id, fn)
+#define EVT_GRID_CMD_SELECT_CELL(id, fn)         wx__DECLARE_GRIDEVT(SELECT_CELL, id, fn)
+#define EVT_GRID_CMD_EDITOR_SHOWN(id, fn)        wx__DECLARE_GRIDEVT(EDITOR_SHOWN, id, fn)
+#define EVT_GRID_CMD_EDITOR_HIDDEN(id, fn)       wx__DECLARE_GRIDEVT(EDITOR_HIDDEN, id, fn)
+#define EVT_GRID_CMD_EDITOR_CREATED(id, fn)      wx__DECLARE_GRIDEDITOREVT(EDITOR_CREATED, id, fn)
+#define EVT_GRID_CMD_CELL_BEGIN_DRAG(id, fn)     wx__DECLARE_GRIDEVT(CELL_BEGIN_DRAG, id, fn)
+
+// same as above but for any id (exists mainly for backwards compatibility but
+// then it's also true that you rarely have multiple grid in the same window)
+#define EVT_GRID_CELL_LEFT_CLICK(fn)     EVT_GRID_CMD_CELL_LEFT_CLICK(wxID_ANY, fn)
+#define EVT_GRID_CELL_RIGHT_CLICK(fn)    EVT_GRID_CMD_CELL_RIGHT_CLICK(wxID_ANY, fn)
+#define EVT_GRID_CELL_LEFT_DCLICK(fn)    EVT_GRID_CMD_CELL_LEFT_DCLICK(wxID_ANY, fn)
+#define EVT_GRID_CELL_RIGHT_DCLICK(fn)   EVT_GRID_CMD_CELL_RIGHT_DCLICK(wxID_ANY, fn)
+#define EVT_GRID_LABEL_LEFT_CLICK(fn)    EVT_GRID_CMD_LABEL_LEFT_CLICK(wxID_ANY, fn)
+#define EVT_GRID_LABEL_RIGHT_CLICK(fn)   EVT_GRID_CMD_LABEL_RIGHT_CLICK(wxID_ANY, fn)
+#define EVT_GRID_LABEL_LEFT_DCLICK(fn)   EVT_GRID_CMD_LABEL_LEFT_DCLICK(wxID_ANY, fn)
+#define EVT_GRID_LABEL_RIGHT_DCLICK(fn)  EVT_GRID_CMD_LABEL_RIGHT_DCLICK(wxID_ANY, fn)
+#define EVT_GRID_ROW_SIZE(fn)            EVT_GRID_CMD_ROW_SIZE(wxID_ANY, fn)
+#define EVT_GRID_COL_SIZE(fn)            EVT_GRID_CMD_COL_SIZE(wxID_ANY, fn)
+#define EVT_GRID_RANGE_SELECT(fn)        EVT_GRID_CMD_RANGE_SELECT(wxID_ANY, fn)
+#define EVT_GRID_CELL_CHANGE(fn)         EVT_GRID_CMD_CELL_CHANGE(wxID_ANY, fn)
+#define EVT_GRID_SELECT_CELL(fn)         EVT_GRID_CMD_SELECT_CELL(wxID_ANY, fn)
+#define EVT_GRID_EDITOR_SHOWN(fn)        EVT_GRID_CMD_EDITOR_SHOWN(wxID_ANY, fn)
+#define EVT_GRID_EDITOR_HIDDEN(fn)       EVT_GRID_CMD_EDITOR_HIDDEN(wxID_ANY, fn)
+#define EVT_GRID_EDITOR_CREATED(fn)      EVT_GRID_CMD_EDITOR_CREATED(wxID_ANY, fn)
+#define EVT_GRID_CELL_BEGIN_DRAG(fn)     EVT_GRID_CMD_CELL_BEGIN_DRAG(wxID_ANY, fn)

 
 #if 0  // TODO: implement these ?  others ?
 
 
 #if 0  // TODO: implement these ?  others ?
 

-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;
+extern const int wxEVT_GRID_CREATE_CELL;
+extern const int wxEVT_GRID_CHANGE_LABELS;
+extern const int wxEVT_GRID_CHANGE_SEL_LABEL;

 
 

-#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_CREATE_CELL(fn)      DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_CREATE_CELL,      wxID_ANY, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridEventFunction, &fn ), NULL ),
+#define EVT_GRID_CHANGE_LABELS(fn)    DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_CHANGE_LABELS,    wxID_ANY, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridEventFunction, &fn ), NULL ),
+#define EVT_GRID_CHANGE_SEL_LABEL(fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_CHANGE_SEL_LABEL, wxID_ANY, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridEventFunction, &fn ), NULL ),

 
 #endif
 
 
 #endif
 

-#endif  // #ifndef __WXGRID_H__
-
-#endif  // ifndef wxUSE_NEW_GRID
+#endif  // ifndef wxUSE_GRID