Better markup.

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

diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index 3fc9dfb640de8b982aff125adf97c6d1aa9c452a..dae05bca1856fdabd06c654a8441a1359d305ed7 100644 (file)
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -11,26 +11,24 @@
 
 #include "wx/defs.h"
 
 
 #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__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "grid.h"
 #endif
 
 #pragma interface "grid.h"
 #endif
 

-#include "wx/hash.h"
+#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
 
 // ----------------------------------------------------------------------------
 // constants


@@ -67,16 +65,16 @@
 // 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 WXDLLEXPORT wxGridTypeRegistry;
-class WXDLLEXPORT wxGridSelection;
+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 wxComboBox;
 
 class WXDLLEXPORT wxCheckBox;
 class WXDLLEXPORT wxComboBox;


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

-class WXDLLEXPORT wxGridCellWorker
+class WXDLLIMPEXP_ADV wxGridCellWorker : public wxClientDataContainer

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


@@ -134,7 +132,7 @@ private:
 // predefined derived classes or derive your own class from it.
 // ----------------------------------------------------------------------------
 
 // predefined derived classes or derive your own class from it.
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGridCellRenderer : public wxGridCellWorker
+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


@@ -162,7 +160,7 @@ public:
 };
 
 // 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


@@ -196,7 +194,7 @@ protected:
 };
 
 // the default renderer for the cells containing numeric (long) data
 };
 
 // the default renderer for the cells containing numeric (long) data

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

 {
 public:
     // draw the string right aligned
 {
 public:
     // draw the string right aligned


@@ -219,7 +217,7 @@ protected:
     wxString GetString(wxGrid& grid, int row, int col);
 };
 
     wxString GetString(wxGrid& grid, int row, int col);
 };
 

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

 {
 public:
     wxGridCellFloatRenderer(int width = -1, int precision = -1);
 {
 public:
     wxGridCellFloatRenderer(int width = -1, int precision = -1);


@@ -260,7 +258,7 @@ private:
 };
 
 // renderer for boolean fields
 };
 
 // renderer for boolean fields

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

 {
 public:
     // draw a check mark or nothing
 {
 public:
     // draw a check mark or nothing


@@ -292,7 +290,7 @@ private:
 // even for the entire grid.
 // ----------------------------------------------------------------------------
 
 // even for the entire grid.
 // ----------------------------------------------------------------------------
 

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

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


@@ -301,6 +299,9 @@ public:
     wxControl* GetControl() { return m_control; }
     void SetControl(wxControl* control) { m_control = control; }
 
     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,
                         wxWindowID id,
     // Creates the actual edit control
     virtual void Create(wxWindow* parent,
                         wxWindowID id,


@@ -328,7 +329,7 @@ public:
     // 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;
 

-    // return TRUE to allow the given key to start editing: the base class
+    // 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
     // 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


@@ -356,6 +357,10 @@ public:
     // create a new object which is the copy of this one
     virtual wxGridCellEditor *Clone() const = 0;
 
     // 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:
     // the dtor is private because only DecRef() can delete us
     virtual ~wxGridCellEditor();
 protected:
     // the dtor is private because only DecRef() can delete us
     virtual ~wxGridCellEditor();


@@ -363,9 +368,12 @@ protected:
     // 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;


@@ -373,10 +381,14 @@ protected:
     // suppress the stupid gcc warning about the class having private dtor and
     // no friends
     friend class wxGridCellEditorDummyFriend;
     // 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();


@@ -402,6 +414,9 @@ public:
     virtual wxGridCellEditor *Clone() const
         { return new wxGridCellTextEditor; }
 
     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; }
 


@@ -412,10 +427,12 @@ protected:
 private:
     size_t   m_maxChars;        // max number of chars allowed
     wxString m_startValue;
 private:
     size_t   m_maxChars;        // max number of chars allowed
     wxString m_startValue;

+
+    DECLARE_NO_COPY_CLASS(wxGridCellTextEditor)

 };
 
 // the editor for numeric (long) data
 };
 
 // the editor for numeric (long) data

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

 {
 public:
     // allows to specify the range - if min == max == -1, no range checking is
 {
 public:
     // allows to specify the range - if min == max == -1, no range checking is


@@ -438,6 +455,9 @@ public:
 
     virtual wxGridCellEditor *Clone() const
         { return new wxGridCellNumberEditor(m_min, m_max); }
 
     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:
     wxSpinCtrl *Spin() const { return (wxSpinCtrl *)m_control; }
 
 protected:
     wxSpinCtrl *Spin() const { return (wxSpinCtrl *)m_control; }


@@ -454,10 +474,12 @@ private:
         m_max;
 
     long m_valueOld;
         m_max;
 
     long m_valueOld;

+
+    DECLARE_NO_COPY_CLASS(wxGridCellNumberEditor)

 };
 
 // the editor for floating point numbers (double) data
 };
 
 // the editor for floating point numbers (double) data

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

 {
 public:
     wxGridCellFloatEditor(int width = -1, int precision = -1);
 {
 public:
     wxGridCellFloatEditor(int width = -1, int precision = -1);


@@ -474,7 +496,7 @@ public:
     virtual void StartingKey(wxKeyEvent& event);
 
     virtual wxGridCellEditor *Clone() const
     virtual void StartingKey(wxKeyEvent& event);
 
     virtual wxGridCellEditor *Clone() const

-        { return new wxGridCellFloatEditor; }
+        { return new wxGridCellFloatEditor(m_width, m_precision); }

 
     // parameters string format is "width,precision"
     virtual void SetParameters(const wxString& params);
 
     // parameters string format is "width,precision"
     virtual void SetParameters(const wxString& params);


@@ -487,12 +509,20 @@ private:
     int m_width,
         m_precision;
     double m_valueOld;
     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);


@@ -509,22 +539,33 @@ public:
 
     virtual wxGridCellEditor *Clone() const
         { return new wxGridCellBoolEditor; }
 
     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
 // the editor for string data allowing to choose from the list of strings

-class WXDLLEXPORT wxGridCellChoiceEditor : public wxGridCellEditor
+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,
 {
 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);
+                           bool allowOthers = false);
+    wxGridCellChoiceEditor(const wxArrayString& choices,
+                           bool allowOthers = false);

 
     virtual void Create(wxWindow* parent,
                         wxWindowID id,
 
     virtual void Create(wxWindow* parent,
                         wxWindowID id,


@@ -541,29 +582,49 @@ public:
     virtual void SetParameters(const wxString& params);
 
     virtual wxGridCellEditor *Clone() const;
     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; }
 
 
 protected:
     wxComboBox *Combo() const { return (wxComboBox *)m_control; }
 

-private:
+// 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;
     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();
+        Init(attrDefault);
+

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


@@ -583,6 +644,7 @@ public:
 
     // creates a new copy of this object
     wxGridCellAttr *Clone() const;
 
     // 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
 
     // 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


@@ -599,7 +661,11 @@ 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)


@@ -607,6 +673,8 @@ public:
     void SetEditor(wxGridCellEditor* editor)
         { wxSafeDecRef(m_editor); m_editor = editor; }
 
     void SetEditor(wxGridCellEditor* 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(); }
     // accessors
     bool HasTextColour() const { return m_colText.Ok(); }
     bool HasBackgroundColour() const { return m_colBack.Ok(); }


@@ -614,29 +682,42 @@ public:
     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 HasAlignment() const { return (m_hAlign != -1 || m_vAlign != -1); }
     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; }

 
     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;

+    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;
 
     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; }
 
 private:
 
     void SetDefAttr(wxGridCellAttr* defAttr) { m_defGridAttr = defAttr; }
 
 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()
 
     // the dtor is private because only DecRef() can delete us
     ~wxGridCellAttr()


@@ -653,15 +734,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
 
     // use Clone() instead

-    DECLARE_NO_COPY_CLASS(wxGridCellAttr);
+    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


@@ -680,14 +767,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


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

+
+    DECLARE_NO_COPY_CLASS(wxGridCellAttrProvider)

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


@@ -713,7 +803,7 @@ private:
 //////////////////////////////////////////////////////////////////////
 
 
 //////////////////////////////////////////////////////////////////////
 
 

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

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


@@ -778,7 +868,9 @@ public:
 
     // by default forwarded to wxGridCellAttrProvider if any. May be
     // overridden to handle attributes directly in the table.
 
     // by default forwarded to wxGridCellAttrProvider if any. May be
     // overridden to handle attributes directly in the table.

-    virtual wxGridCellAttr *GetAttr( int row, int col );
+    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);


@@ -790,6 +882,7 @@ private:
     wxGridCellAttrProvider *m_attrProvider;
 
     DECLARE_ABSTRACT_CLASS( wxGridTableBase );
     wxGridCellAttrProvider *m_attrProvider;
 
     DECLARE_ABSTRACT_CLASS( wxGridTableBase );

+    DECLARE_NO_COPY_CLASS(wxGridTableBase)

 };
 
 
 };
 
 


@@ -811,7 +904,7 @@ enum wxGridTableRequest
     wxGRIDTABLE_NOTIFY_COLS_DELETED
 };
 
     wxGRIDTABLE_NOTIFY_COLS_DELETED
 };
 

-class WXDLLEXPORT wxGridTableMessage
+class WXDLLIMPEXP_ADV wxGridTableMessage

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


@@ -833,6 +926,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)

 };
 
 
 };
 
 


@@ -841,7 +936,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);

 
 
 
 
 
 


@@ -851,12 +947,12 @@ 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
     //


@@ -890,7 +986,7 @@ private:
     wxArrayString     m_rowLabels;
     wxArrayString     m_colLabels;
 
     wxArrayString     m_rowLabels;
     wxArrayString     m_colLabels;
 

-    DECLARE_DYNAMIC_CLASS( wxGridStringTable )
+    DECLARE_DYNAMIC_CLASS_NO_COPY( wxGridStringTable )

 };
 
 
 };
 
 


@@ -903,7 +999,7 @@ private:
 // wxGridCellCoords: location of a cell in the grid
 // ----------------------------------------------------------------------------
 
 // wxGridCellCoords: location of a cell in the grid
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGridCellCoords
+class WXDLLIMPEXP_ADV wxGridCellCoords

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


@@ -950,33 +1046,38 @@ private:
 
 // For comparisons...
 //
 
 // For comparisons...
 //

-extern WXDLLEXPORT wxGridCellCoords wxGridNoCellCoords;
-extern WXDLLEXPORT 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,
             long style = wxWANTS_CHARS,
             const wxString& name = wxPanelNameStr );
 
             wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxWANTS_CHARS,
             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();

 
     enum wxGridSelectionModes {wxGridSelectCells,
                                wxGridSelectRows,
 
     enum wxGridSelectionModes {wxGridSelectCells,
                                wxGridSelectRows,


@@ -987,6 +1088,7 @@ public:
                      wxGrid::wxGridSelectCells );
 
     void SetSelectionMode(wxGrid::wxGridSelectionModes selmode);
                      wxGrid::wxGridSelectCells );
 
     void SetSelectionMode(wxGrid::wxGridSelectionModes selmode);

+    wxGrid::wxGridSelectionModes GetSelectionMode() const;

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


@@ -996,10 +1098,10 @@ public:
 
     // ------ display update functions
     //
 
     // ------ display update functions
     //

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

 
 

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

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


@@ -1014,33 +1116,33 @@ 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();
                    wxGrid::wxGridSelectionModes selmode =
                    wxGrid::wxGridSelectCells );
 
     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 DrawGridSpace( wxDC& dc );
     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 DrawRowLabels( wxDC& dc, const wxArrayInt& rows );

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

-    void DrawColLabels( wxDC& dc );
+    void DrawColLabels( wxDC& dc, const wxArrayInt& cols );

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


@@ -1048,7 +1150,14 @@ public:
     //
     void DrawTextRectangle( wxDC& dc, const wxString&, const wxRect&,
                             int horizontalAlignment = wxALIGN_LEFT,
     //
     void DrawTextRectangle( wxDC& dc, const wxString&, const wxRect&,
                             int horizontalAlignment = wxALIGN_LEFT,

-                            int verticalAlignment = wxALIGN_TOP );
+                            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
 
     // Split a string containing newline chararcters into an array of
     // strings and return the number of lines


@@ -1056,7 +1165,7 @@ public:
     void StringToLines( const wxString& value, wxArrayString& lines );
 
     void GetTextBoxSize( wxDC& dc,
     void StringToLines( const wxString& value, wxArrayString& lines );
 
     void GetTextBoxSize( wxDC& dc,

-                         wxArrayString& lines,
+                         const wxArrayString& lines,

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


@@ -1070,6 +1179,9 @@ public:
 
     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.
     // 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.


@@ -1078,15 +1190,15 @@ public:
     // handler to reduce screen flicker.
     //
     void     ForceRefresh();
     // 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 IsCellEditControlShown() const;
     bool CanEnableCellControl() const;
     bool IsCellEditControlEnabled() const;
     bool IsCellEditControlShown() const;


@@ -1120,8 +1232,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 )


@@ -1156,10 +1268,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; }
     wxColour GetCellHighlightColour() { return m_cellHighlightColour; }
     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 );


@@ -1168,22 +1283,26 @@ 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     SetCellHighlightColour( const wxColour& );
     void     SetRowLabelValue( int row, const wxString& );
     void     SetColLabelValue( int col, const wxString& );
     void     SetGridLineColour( const wxColour& );
     void     SetCellHighlightColour( const wxColour& );

+    void     SetCellHighlightPenWidth(int width);
+    void     SetCellHighlightROPenWidth(int width);

 
 

-    void     EnableDragRowSize( bool enable = TRUE );
-    void     DisableDragRowSize() { EnableDragRowSize( FALSE ); }
+    void     EnableDragRowSize( bool enable = true );
+    void     DisableDragRowSize() { EnableDragRowSize( false ); }

     bool     CanDragRowSize() { return m_canDragRowSize; }
     bool     CanDragRowSize() { return m_canDragRowSize; }

-    void     EnableDragColSize( bool enable = TRUE );
-    void     DisableDragColSize() { EnableDragColSize( FALSE ); }
+    void     EnableDragColSize( bool enable = true );
+    void     DisableDragColSize() { EnableDragColSize( false ); }

     bool     CanDragColSize() { return m_canDragColSize; }
     bool     CanDragColSize() { return m_canDragColSize; }

-    void     EnableDragGridSize(bool enable = TRUE);
-    void     DisableDragGridSize() { EnableDragGridSize(FALSE); }
+    void     EnableDragGridSize(bool enable = true);
+    void     DisableDragGridSize() { EnableDragGridSize(false); }

     bool     CanDragGridSize() { return m_canDragGridSize; }
 
     bool     CanDragGridSize() { return m_canDragGridSize; }
 

-    // this sets the specified attribute for all cells in this row/col
+    // 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);
 


@@ -1195,7 +1314,7 @@ public:
     void     SetColFormatFloat(int col, int width = -1, int precision = -1);
     void     SetColFormatCustom(int col, const wxString& typeName);
 
     void     SetColFormatFloat(int col, int width = -1, int precision = -1);
     void     SetColFormatCustom(int col, const wxString& typeName);
 

-    void     EnableGridLines( bool enable = TRUE );
+    void     EnableGridLines( bool enable = true );

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


@@ -1212,38 +1331,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 );
 
     // automatically size the column or row to fit to its contents, if
 
     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
+    // setAsMin is true, this optimal width will also be set as minimal width

     // for this column
     // 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); }
+    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!)
 
     // auto size all columns (very ineffective for big grids!)

-    void     AutoSizeColumns( bool setAsMin = TRUE )
-        { (void)SetOrCalcColumnSizes(FALSE, setAsMin); }
+    void     AutoSizeColumns( bool setAsMin = true )
+        { (void)SetOrCalcColumnSizes(false, setAsMin); }

 
 

-    void     AutoSizeRows( bool setAsMin = TRUE )
-        { (void)SetOrCalcRowSizes(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();
 
 
     // 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 );
 
     // 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& );


@@ -1253,6 +1393,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);


@@ -1289,23 +1432,23 @@ 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 );
+                      bool addToSelected = false );

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

-                      bool addToSelected = FALSE )
+                      bool addToSelected = false )

         { SelectBlock( topLeft.GetRow(), topLeft.GetCol(),
                        bottomRight.GetRow(), bottomRight.GetCol(),
                        addToSelected ); }
         { SelectBlock( topLeft.GetRow(), topLeft.GetCol(),
                        bottomRight.GetRow(), bottomRight.GetCol(),
                        addToSelected ); }


@@ -1314,13 +1457,24 @@ public:
 
     bool IsSelection();
 
 
     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 );
+    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() ); }
 

+    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


@@ -1343,12 +1497,13 @@ public:
     void RegisterDataType(const wxString& typeName,
                           wxGridCellRenderer* renderer,
                           wxGridCellEditor* editor);
     void RegisterDataType(const wxString& typeName,
                           wxGridCellRenderer* renderer,
                           wxGridCellEditor* editor);

-    wxGridCellEditor* GetDefaultEditorForCell(int row, int col) const;
+    // DJC MAPTEK
+    virtual wxGridCellEditor* GetDefaultEditorForCell(int row, int col) const;

     wxGridCellEditor* GetDefaultEditorForCell(const wxGridCellCoords& c) const
         { return GetDefaultEditorForCell(c.GetRow(), c.GetCol()); }
     wxGridCellEditor* GetDefaultEditorForCell(const wxGridCellCoords& c) const
         { return GetDefaultEditorForCell(c.GetRow(), c.GetCol()); }

-    wxGridCellRenderer* GetDefaultRendererForCell(int row, int col) const;
-    wxGridCellEditor* GetDefaultEditorForType(const wxString& typeName) const;
-    wxGridCellRenderer* GetDefaultRendererForType(const wxString& typeName) const;
+    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
 
     // grid may occupy more space than needed for its rows/columns, this
     // function allows to set how big this extra space is


@@ -1356,8 +1511,18 @@ public:
     {
         m_extraWidth = extraWidth;
         m_extraHeight = 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; }
+
+
+

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


@@ -1368,10 +1533,10 @@ public:
     //
 
     wxGrid( wxWindow *parent,
     //
 
     wxGrid( wxWindow *parent,

-            int x, int y, int w = -1, int h = -1,
+            int x, int y, int w = wxDefaultSize.x, int h = wxDefaultSize.y,

             long style = wxWANTS_CHARS,
             const wxString& name = wxPanelNameStr )
             long style = wxWANTS_CHARS,
             const wxString& name = wxPanelNameStr )

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

                             (style|wxWANTS_CHARS), name )
         {
             Create();
                             (style|wxWANTS_CHARS), name )
         {
             Create();


@@ -1491,10 +1656,10 @@ 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 WXUNUSED(edit) = TRUE) { }
+    void SetEditInPlace(bool WXUNUSED(edit) = true) { }

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


@@ -1535,11 +1700,6 @@ 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;
 
     int m_numRows;
     int m_numCols;
 


@@ -1559,6 +1719,7 @@ protected:
     void InitRowHeights();
 
     int        m_defaultRowHeight;
     void InitRowHeights();
 
     int        m_defaultRowHeight;

+    int        m_minAcceptableRowHeight;

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


@@ -1566,6 +1727,7 @@ protected:
     void InitColWidths();
 
     int        m_defaultColWidth;
     void InitColWidths();
 
     int        m_defaultColWidth;

+    int        m_minAcceptableColWidth;

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


@@ -1597,6 +1759,7 @@ 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;
 
     bool       m_defaultRowLabelValues;
     bool       m_defaultColLabelValues;


@@ -1604,18 +1767,21 @@ protected:
     wxColour   m_gridLineColour;
     bool       m_gridLinesEnabled;
     wxColour   m_cellHighlightColour;
     wxColour   m_gridLineColour;
     bool       m_gridLinesEnabled;
     wxColour   m_cellHighlightColour;

+    int        m_cellHighlightPenWidth;
+    int        m_cellHighlightROPenWidth;
+

 
     // common part of AutoSizeColumn/Row() and GetBestSize()
 
     // common part of AutoSizeColumn/Row() and GetBestSize()

-    int SetOrCalcColumnSizes(bool calcOnly, bool setAsMin = TRUE);
-    int SetOrCalcRowSizes(bool calcOnly, bool setAsMin = TRUE);
+    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
 
     // 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

-    wxHashTableLong m_colMinWidths,
-                    m_rowMinHeights;
+    wxLongToLongHashMap m_colMinWidths,
+                        m_rowMinHeights;

 
     // get the minimal width of the given column/row
     int GetColMinimalWidth(int col) const;
 
     // get the minimal width of the given column/row
     int GetColMinimalWidth(int col) const;


@@ -1644,7 +1810,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


@@ -1657,12 +1823,6 @@ 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;
 


@@ -1679,14 +1839,14 @@ 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;


@@ -1717,9 +1877,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(),


@@ -1740,7 +1900,7 @@ protected:
     void HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCol );
 
     void HighlightBlock( const wxGridCellCoords& topLeft,
     void HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCol );
 
     void HighlightBlock( const wxGridCellCoords& topLeft,

-                      const wxGridCellCoords& bottomRight )
+                         const wxGridCellCoords& bottomRight )

         { HighlightBlock( topLeft.GetRow(), topLeft.GetCol(),
                        bottomRight.GetRow(), bottomRight.GetCol() ); }
 
         { HighlightBlock( topLeft.GetRow(), topLeft.GetCol(),
                        bottomRight.GetRow(), bottomRight.GetCol() ); }
 


@@ -1749,17 +1909,19 @@ protected:
     bool GetModelValues();
     bool SetModelValues();
 
     bool GetModelValues();
     bool SetModelValues();
 

-        friend class wxGridSelection;
+    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()
 {
 public:
     wxGridEvent()


@@ -1769,8 +1931,8 @@ public:
         }
 
     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 sel = TRUE,
-                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; }
 
     virtual int GetRow() { return m_row; }
     virtual int GetCol() { return m_col; }


@@ -1792,10 +1954,10 @@ protected:
     bool        m_shift;
     bool        m_alt;
 
     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()


@@ -1806,7 +1968,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 ); }


@@ -1824,11 +1986,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()


@@ -1836,19 +1998,19 @@ public:
         {
             m_topLeft     = wxGridNoCellCoords;
             m_bottomRight = wxGridNoCellCoords;
         {
             m_topLeft     = wxGridNoCellCoords;
             m_bottomRight = wxGridNoCellCoords;

-            m_selecting   = FALSE;
-            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 sel = TRUE,
-                           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; }


@@ -1871,60 +2033,111 @@ protected:
     bool              m_shift;
     bool              m_alt;
 
     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)
+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 EVT_GRID_CELL_LEFT_CLICK(fn)     DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_CELL_LEFT_CLICK,    wxID_ANY, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridEventFunction, &fn ), NULL ),
+#define EVT_GRID_CELL_RIGHT_CLICK(fn)    DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_CELL_RIGHT_CLICK,   wxID_ANY, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridEventFunction, &fn ), NULL ),
+#define EVT_GRID_CELL_LEFT_DCLICK(fn)    DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_CELL_LEFT_DCLICK,   wxID_ANY, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridEventFunction, &fn ), NULL ),
+#define EVT_GRID_CELL_RIGHT_DCLICK(fn)   DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_CELL_RIGHT_DCLICK,  wxID_ANY, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridEventFunction, &fn ), NULL ),
+#define EVT_GRID_LABEL_LEFT_CLICK(fn)    DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_LABEL_LEFT_CLICK,   wxID_ANY, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridEventFunction, &fn ), NULL ),
+#define EVT_GRID_LABEL_RIGHT_CLICK(fn)   DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_LABEL_RIGHT_CLICK,  wxID_ANY, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridEventFunction, &fn ), NULL ),
+#define EVT_GRID_LABEL_LEFT_DCLICK(fn)   DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_LABEL_LEFT_DCLICK,  wxID_ANY, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridEventFunction, &fn ), NULL ),
+#define EVT_GRID_LABEL_RIGHT_DCLICK(fn)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_LABEL_RIGHT_DCLICK, wxID_ANY, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridEventFunction, &fn ), NULL ),
+#define EVT_GRID_ROW_SIZE(fn)            DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_ROW_SIZE,           wxID_ANY, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridSizeEventFunction, &fn ), NULL ),
+#define EVT_GRID_COL_SIZE(fn)            DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_COL_SIZE,           wxID_ANY, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridSizeEventFunction, &fn ), NULL ),
+#define EVT_GRID_RANGE_SELECT(fn)        DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_RANGE_SELECT,       wxID_ANY, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridRangeSelectEventFunction, &fn ), NULL ),
+#define EVT_GRID_CELL_CHANGE(fn)         DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_CELL_CHANGE,        wxID_ANY, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridEventFunction, &fn ), NULL ),
+#define EVT_GRID_SELECT_CELL(fn)         DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_SELECT_CELL,        wxID_ANY, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridEventFunction, &fn ), NULL ),
+#define EVT_GRID_EDITOR_SHOWN(fn)        DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_EDITOR_SHOWN,       wxID_ANY, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridEventFunction, &fn ), NULL ),
+#define EVT_GRID_EDITOR_HIDDEN(fn)       DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_EDITOR_HIDDEN,      wxID_ANY, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridEventFunction, &fn ), NULL ),
+#define EVT_GRID_EDITOR_CREATED(fn)      DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_EDITOR_CREATED,     wxID_ANY, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridEditorCreatedEventFunction, &fn ), NULL ),
+
+// The same as above but with the ability to specify an identifier
+#define EVT_GRID_CMD_CELL_LEFT_CLICK(id, fn)     DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_CELL_LEFT_CLICK,    id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridEventFunction, &fn ), NULL ),
+#define EVT_GRID_CMD_CELL_RIGHT_CLICK(id, fn)    DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_CELL_RIGHT_CLICK,   id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridEventFunction, &fn ), NULL ),
+#define EVT_GRID_CMD_CELL_LEFT_DCLICK(id, fn)    DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_CELL_LEFT_DCLICK,   id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridEventFunction, &fn ), NULL ),
+#define EVT_GRID_CMD_CELL_RIGHT_DCLICK(id, fn)   DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_CELL_RIGHT_DCLICK,  id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridEventFunction, &fn ), NULL ),
+#define EVT_GRID_CMD_LABEL_LEFT_CLICK(id, fn)    DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_LABEL_LEFT_CLICK,   id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridEventFunction, &fn ), NULL ),
+#define EVT_GRID_CMD_LABEL_RIGHT_CLICK(id, fn)   DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_LABEL_RIGHT_CLICK,  id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridEventFunction, &fn ), NULL ),
+#define EVT_GRID_CMD_LABEL_LEFT_DCLICK(id, fn)   DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_LABEL_LEFT_DCLICK,  id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridEventFunction, &fn ), NULL ),
+#define EVT_GRID_CMD_LABEL_RIGHT_DCLICK(id, fn)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_LABEL_RIGHT_DCLICK, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridEventFunction, &fn ), NULL ),
+#define EVT_GRID_CMD_ROW_SIZE(id, fn)            DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_ROW_SIZE,           id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridSizeEventFunction, &fn ), NULL ),
+#define EVT_GRID_CMD_COL_SIZE(id, fn)            DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_COL_SIZE,           id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridSizeEventFunction, &fn ), NULL ),
+#define EVT_GRID_CMD_RANGE_SELECT(id, fn)        DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_RANGE_SELECT,       id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridRangeSelectEventFunction, &fn ), NULL ),
+#define EVT_GRID_CMD_CELL_CHANGE(id, fn)         DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_CELL_CHANGE,        id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridEventFunction, &fn ), NULL ),
+#define EVT_GRID_CMD_SELECT_CELL(id, fn)         DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_SELECT_CELL,        id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridEventFunction, &fn ), NULL ),
+#define EVT_GRID_CMD_EDITOR_SHOWN(id, fn)        DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_EDITOR_SHOWN,       id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridEventFunction, &fn ), NULL ),
+#define EVT_GRID_CMD_EDITOR_HIDDEN(id, fn)       DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_EDITOR_HIDDEN,      id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridEventFunction, &fn ), NULL ),
+#define EVT_GRID_CMD_EDITOR_CREATED(id, fn)      DECLARE_EVENT_TABLE_ENTRY( wxEVT_GRID_EDITOR_CREATED,     id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxGridEditorCreatedEventFunction, &fn ), NULL ),

 
 #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_GRID

 
 

-#endif  // ifndef wxUSE_NEW_GRID