Applied DrawArc patch.

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

diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index 89bae8bd1f1f398a95731304ae9fdc6d3b78a402..21ad06b098d4d4c724819726bb03e6fe3e1da52f 100644 (file)
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -48,7 +48,7 @@
 #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


@@ -58,6 +58,7 @@
 #define wxGRID_VALUE_BOOL       _T("bool")
 #define wxGRID_VALUE_NUMBER     _T("long")
 #define wxGRID_VALUE_FLOAT      _T("double")
 #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
 
 #define wxGRID_VALUE_TEXT wxGRID_VALUE_STRING
 #define wxGRID_VALUE_LONG wxGRID_VALUE_NUMBER


@@ -75,6 +76,7 @@ class WXDLLEXPORT wxGridRowLabelWindow;
 class WXDLLEXPORT wxGridTableBase;
 class WXDLLEXPORT wxGridWindow;
 class WXDLLEXPORT wxGridTypeRegistry;
 class WXDLLEXPORT wxGridTableBase;
 class WXDLLEXPORT wxGridWindow;
 class WXDLLEXPORT wxGridTypeRegistry;

+class WXDLLEXPORT wxGridSelection;

 
 class WXDLLEXPORT wxCheckBox;
 class WXDLLEXPORT wxComboBox;
 
 class WXDLLEXPORT wxCheckBox;
 class WXDLLEXPORT wxComboBox;


@@ -89,17 +91,17 @@ class WXDLLEXPORT wxSpinCtrl;
 #define wxSafeDecRef(p) if ( p ) (p)->DecRef()
 
 // ----------------------------------------------------------------------------
 #define wxSafeDecRef(p) if ( p ) (p)->DecRef()
 
 // ----------------------------------------------------------------------------

-// 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 your own class from it.
+// 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 WXDLLEXPORT wxGridCellRenderer
+class WXDLLEXPORT wxGridCellWorker

 {
 public:
 {
 public:

-    wxGridCellRenderer() { m_nRef = 1; }
+    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
 
     // 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


@@ -107,6 +109,34 @@ public:
     void IncRef() { m_nRef++; }
     void DecRef() { if ( !--m_nRef ) delete this; }
 
     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
+// predefined derived classes or derive your own class from it.
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxGridCellRenderer : public wxGridCellWorker
+{
+public:

     // draw the given cell on the provided DC inside the given rectangle
     // using the style specified by the attribute and the default or selected
     // state corresponding to the isSelected value.
     // draw the given cell on the provided DC inside the given rectangle
     // using the style specified by the attribute and the default or selected
     // state corresponding to the isSelected value.


@@ -127,17 +157,8 @@ public:
                                wxDC& dc,
                                int row, int col) = 0;
 
                                wxDC& dc,
                                int row, int col) = 0;
 

-protected:
-    // virtual dtor for any base class - private because only DecRef() can
-    // delete us
-    virtual ~wxGridCellRenderer();
-
-private:
-    size_t m_nRef;
-
-    // suppress the stupid gcc warning about the class having private dtor and
-    // no friends
-    friend class wxGridCellRendererDummyFriend;
+    // 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


@@ -158,6 +179,9 @@ public:
                                wxDC& dc,
                                int row, int col);
 
                                wxDC& dc,
                                int row, int col);
 

+    virtual wxGridCellRenderer *Clone() const
+        { return new wxGridCellStringRenderer; }
+

 protected:
     // set the text colours before drawing
     void SetTextColoursAndFont(wxGrid& grid,
 protected:
     // set the text colours before drawing
     void SetTextColoursAndFont(wxGrid& grid,


@@ -188,6 +212,9 @@ public:
                                wxDC& dc,
                                int row, int col);
 
                                wxDC& dc,
                                int row, int col);
 

+    virtual wxGridCellRenderer *Clone() const
+        { return new wxGridCellNumberRenderer; }
+

 protected:
     wxString GetString(wxGrid& grid, int row, int col);
 };
 protected:
     wxString GetString(wxGrid& grid, int row, int col);
 };


@@ -195,13 +222,13 @@ protected:
 class WXDLLEXPORT wxGridCellFloatRenderer : public wxGridCellStringRenderer
 {
 public:
 class WXDLLEXPORT wxGridCellFloatRenderer : public wxGridCellStringRenderer
 {
 public:

-    wxGridCellFloatRenderer(int width, int precision);
+    wxGridCellFloatRenderer(int width = -1, int precision = -1);

 
     // get/change formatting parameters
     int GetWidth() const { return m_width; }
 
     // get/change formatting parameters
     int GetWidth() const { return m_width; }

-    void SetWidth(int width) { m_width = width; }
+    void SetWidth(int width) { m_width = width; m_format.clear(); }

     int GetPrecision() const { return m_precision; }
     int GetPrecision() const { return m_precision; }

-    void SetPrecision(int precision) { m_precision = 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,
 
     // draw the string right aligned with given width/precision
     virtual void Draw(wxGrid& grid,


@@ -215,13 +242,19 @@ public:
                                wxGridCellAttr& attr,
                                wxDC& dc,
                                int row, int col);
                                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(wxGrid& grid, int row, int col);
 
 private:
     // formatting parameters
     int m_width,
 protected:
     wxString GetString(wxGrid& grid, int row, int col);
 
 private:
     // formatting parameters
     int m_width,

-    m_precision;
+        m_precision;

 
     wxString m_format;
 };
 
     wxString m_format;
 };


@@ -244,6 +277,9 @@ public:
                                wxDC& dc,
                                int row, int col);
 
                                wxDC& dc,
                                int row, int col);
 

+    virtual wxGridCellRenderer *Clone() const
+        { return new wxGridCellBoolRenderer; }
+

 private:
     static wxSize ms_sizeCheckMark;
 };
 private:
     static wxSize ms_sizeCheckMark;
 };


@@ -256,18 +292,14 @@ private:
 // even for the entire grid.
 // ----------------------------------------------------------------------------
 
 // even for the entire grid.
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGridCellEditor
+class WXDLLEXPORT wxGridCellEditor : public wxGridCellWorker

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

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

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

+    wxControl* GetControl() { return m_control; }
+    void SetControl(wxControl* control) { m_control = control; }

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


@@ -296,9 +328,18 @@ 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;
 

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


@@ -312,13 +353,13 @@ 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;
+

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

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

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


@@ -347,6 +388,7 @@ public:
 
     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 bool EndEdit(int row, int col, wxGrid* grid);
 
     virtual void BeginEdit(int row, int col, wxGrid* grid);
     virtual bool EndEdit(int row, int col, wxGrid* grid);
 


@@ -354,6 +396,12 @@ public:
     virtual void StartingKey(wxKeyEvent& event);
     virtual void HandleReturn(wxKeyEvent& event);
 
     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; }
+

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


@@ -362,6 +410,7 @@ protected:
     void DoReset(const wxString& startValue);
 
 private:
     void DoReset(const wxString& startValue);
 
 private:

+    size_t   m_maxChars;        // max number of chars allowed

     wxString m_startValue;
 };
 
     wxString m_startValue;
 };
 


@@ -377,12 +426,19 @@ public:
                         wxWindowID id,
                         wxEvtHandler* evtHandler);
 
                         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 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); }
+

 protected:
     wxSpinCtrl *Spin() const { return (wxSpinCtrl *)m_control; }
 
 protected:
     wxSpinCtrl *Spin() const { return (wxSpinCtrl *)m_control; }
 


@@ -404,22 +460,32 @@ private:
 class WXDLLEXPORT wxGridCellFloatEditor : public wxGridCellTextEditor
 {
 public:
 class WXDLLEXPORT wxGridCellFloatEditor : public wxGridCellTextEditor
 {
 public:

+    wxGridCellFloatEditor(int width = -1, int precision = -1);
+

     virtual void Create(wxWindow* parent,
                         wxWindowID id,
                         wxEvtHandler* evtHandler);
 
     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 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; }
+
+    // parameters string format is "width,precision"
+    virtual void SetParameters(const wxString& params);
+

 protected:
     // string representation of m_valueOld
 protected:
     // string representation of m_valueOld

-    wxString GetString() const
-        { return wxString::Format(_T("%f"), m_valueOld); }
+    wxString GetString() const;

 
 private:
 
 private:

+    int m_width,
+        m_precision;

     double m_valueOld;
 };
 
     double m_valueOld;
 };
 


@@ -434,12 +500,16 @@ 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 bool EndEdit(int row, int col, wxGrid* grid);
 
     virtual void Reset();
     virtual void StartingClick();
 
     virtual void BeginEdit(int row, int col, wxGrid* grid);
     virtual bool EndEdit(int row, int col, wxGrid* grid);
 
     virtual void Reset();
     virtual void StartingClick();
 

+    virtual wxGridCellEditor *Clone() const
+        { return new wxGridCellBoolEditor; }
+

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


@@ -452,7 +522,8 @@ class WXDLLEXPORT wxGridCellChoiceEditor : public wxGridCellEditor
 {
 public:
     // if !allowOthers, user can't type a string not in choices array
 {
 public:
     // if !allowOthers, user can't type a string not in choices array

-    wxGridCellChoiceEditor(size_t count, const wxChar* choices[],
+    wxGridCellChoiceEditor(size_t count = 0,
+                           const wxString choices[] = NULL,

                            bool allowOthers = FALSE);
 
     virtual void Create(wxWindow* parent,
                            bool allowOthers = FALSE);
 
     virtual void Create(wxWindow* parent,


@@ -466,6 +537,11 @@ public:
 
     virtual void Reset();
 
 
     virtual void Reset();
 

+    // parameters string format is "item1[,item2[...,itemN]]"
+    virtual void SetParameters(const wxString& params);
+
+    virtual wxGridCellEditor *Clone() const;
+

 protected:
     wxComboBox *Combo() const { return (wxComboBox *)m_control; }
 
 protected:
     wxComboBox *Combo() const { return (wxComboBox *)m_control; }
 


@@ -488,7 +564,8 @@ public:
     wxGridCellAttr()
     {
         Init();
     wxGridCellAttr()
     {
         Init();

-        SetAlignment(0, 0);
+        // 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


@@ -534,7 +611,7 @@ public:
     bool HasTextColour() const { return m_colText.Ok(); }
     bool HasBackgroundColour() const { return m_colBack.Ok(); }
     bool HasFont() const { return m_font.Ok(); }
     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; }
 


@@ -644,8 +721,8 @@ 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 int GetNumberRows() = 0;
+    virtual int GetNumberCols() = 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;
     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;


@@ -699,11 +776,6 @@ public:
     // a wxGridCellAttrProvider if necessary.
     virtual bool CanHaveAttributes();
 
     // a wxGridCellAttrProvider if necessary.
     virtual bool CanHaveAttributes();
 

-
-    // change row/col number in attribute if needed
-    virtual void UpdateAttrRows( size_t pos, int numRows );
-    virtual void UpdateAttrCols( size_t pos, int numCols );
-

     // by default forwarded to wxGridCellAttrProvider if any. May be
     // overridden to handle attributes directly in the table.
     virtual wxGridCellAttr *GetAttr( int row, int col );
     // by default forwarded to wxGridCellAttrProvider if any. May be
     // overridden to handle attributes directly in the table.
     virtual wxGridCellAttr *GetAttr( int row, int col );


@@ -788,8 +860,8 @@ public:
 
     // 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 );


@@ -839,11 +911,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 )
     {


@@ -871,15 +943,15 @@ 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 WXDLLEXPORT wxGridCellCoords wxGridNoCellCoords;
+extern WXDLLEXPORT wxRect           wxGridNoCellRect;

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


@@ -906,8 +978,15 @@ public:
 
     ~wxGrid();
 
 
     ~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);

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


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

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

 
 

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

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


@@ -935,7 +1014,9 @@ 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();
     bool InsertRows( int pos = 0, int numRows = 1, bool updateLabels=TRUE );
 
     void ClearGrid();
     bool InsertRows( int pos = 0, int numRows = 1, bool updateLabels=TRUE );


@@ -966,8 +1047,8 @@ public:
     // ------ 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 );

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


@@ -985,9 +1066,19 @@ 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; }
 

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


@@ -998,6 +1089,7 @@ public:
     void DisableCellEditControl() { EnableCellEditControl(FALSE); }
     bool CanEnableCellControl() const;
     bool IsCellEditControlEnabled() const;
     void DisableCellEditControl() { EnableCellEditControl(FALSE); }
     bool CanEnableCellControl() const;
     bool IsCellEditControlEnabled() const;

+    bool IsCellEditControlShown() const;

 
     bool IsCurrentCellReadOnly() const;
 
 
     bool IsCurrentCellReadOnly() const;
 


@@ -1041,16 +1133,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


@@ -1067,6 +1159,7 @@ public:
     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; }

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


@@ -1078,6 +1171,7 @@ public:
     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& );

+    void     SetCellHighlightColour( const wxColour& );

 
     void     EnableDragRowSize( bool enable = TRUE );
     void     DisableDragRowSize() { EnableDragRowSize( FALSE ); }
 
     void     EnableDragRowSize( bool enable = TRUE );
     void     DisableDragRowSize() { EnableDragRowSize( FALSE ); }


@@ -1089,11 +1183,18 @@ public:
     void     DisableDragGridSize() { EnableDragGridSize(FALSE); }
     bool     CanDragGridSize() { return m_canDragGridSize; }
 
     void     DisableDragGridSize() { EnableDragGridSize(FALSE); }
     bool     CanDragGridSize() { return m_canDragGridSize; }
 

-

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

+    // 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; }
 
     void     EnableGridLines( bool enable = TRUE );
     bool     GridLinesEnabled() { return m_gridLinesEnabled; }
 


@@ -1199,43 +1300,27 @@ public:
     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();

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

 
     bool IsInSelection( const wxGridCellCoords& coords )
         { return IsInSelection( coords.GetRow(), coords.GetCol() ); }
 
 
     bool IsInSelection( const wxGridCellCoords& coords )
         { 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();
-        }
-

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


@@ -1244,15 +1329,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; }


@@ -1295,7 +1371,7 @@ public:
             int x, int y, int w = -1, int h = -1,
             long style = wxWANTS_CHARS,
             const wxString& name = wxPanelNameStr )
             int x, int y, int w = -1, int h = -1,
             long style = wxWANTS_CHARS,
             const wxString& name = wxPanelNameStr )

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

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


@@ -1315,8 +1391,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 ); }


@@ -1418,15 +1494,15 @@ public:
     void SetEditable( bool edit = TRUE ) { EnableEditing( edit ); }
     bool GetEditInPlace() { return IsCellEditControlEnabled(); }
 
     void SetEditable( bool edit = TRUE ) { EnableEditing( edit ); }
     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 **********


@@ -1450,7 +1526,6 @@ protected:
     virtual wxSize DoGetBestSize() const;
 
     bool m_created;
     virtual wxSize DoGetBestSize() const;
 
     bool m_created;

-    bool m_displayed;

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


@@ -1460,18 +1535,15 @@ 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;
 


@@ -1526,6 +1598,7 @@ protected:
 
     wxColour   m_gridLineColour;
     bool       m_gridLinesEnabled;
 
     wxColour   m_gridLineColour;
     bool       m_gridLinesEnabled;

+    wxColour   m_cellHighlightColour;

 
     // common part of AutoSizeColumn/Row() and GetBestSize()
     int SetOrCalcColumnSizes(bool calcOnly, bool setAsMin = TRUE);
 
     // common part of AutoSizeColumn/Row() and GetBestSize()
     int SetOrCalcColumnSizes(bool calcOnly, bool setAsMin = TRUE);


@@ -1651,6 +1724,7 @@ protected:
     void OnPaint( wxPaintEvent& );
     void OnSize( wxSizeEvent& );
     void OnKeyDown( wxKeyEvent& );
     void OnPaint( wxPaintEvent& );
     void OnSize( wxSizeEvent& );
     void OnKeyDown( wxKeyEvent& );

+    void OnKeyUp( wxKeyEvent& );

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


@@ -1658,12 +1732,19 @@ 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 wxGridSelection;

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


@@ -1678,17 +1759,18 @@ class WXDLLEXPORT 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,
+                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 ); }
                 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 ); }

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


@@ -1699,6 +1781,7 @@ 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_control;
     bool        m_meta;
     bool        m_shift;


@@ -1748,6 +1831,7 @@ 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_control     = FALSE;
             m_meta        = FALSE;
             m_shift       = FALSE;


@@ -1757,6 +1841,7 @@ public:
     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 control=FALSE, bool shift=FALSE,
                            bool alt=FALSE, bool meta=FALSE);
 


@@ -1766,6 +1851,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; }


@@ -1774,6 +1860,7 @@ 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_control;
     bool              m_meta;
     bool              m_shift;


@@ -1836,4 +1923,3 @@ const wxEventType wxEVT_GRID_CHANGE_SEL_LABEL = wxEVT_FIRST + 1578;
 #endif  // #ifndef __WXGRID_H__
 
 #endif  // ifndef wxUSE_NEW_GRID
 #endif  // #ifndef __WXGRID_H__
 
 #endif  // ifndef wxUSE_NEW_GRID

-