activating DrawRectangle optimization

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

diff --git a/include/wx/generic/private/grid.h b/include/wx/generic/private/grid.h
index e2ed4757d8bb3f982d9e25df99c443c8e17b7d34..39ca13794a62cf5627452481fe5ea9d658c7fa8c 100644 (file)
--- a/include/wx/generic/private/grid.h
+++ b/include/wx/generic/private/grid.h
@@ -107,7 +107,7 @@ public:
         // we can't know in advance whether we can sort by this column or not
         // with wxGrid API so suppose we can by default
         int flags = wxCOL_SORTABLE;
         // we can't know in advance whether we can sort by this column or not
         // with wxGrid API so suppose we can by default
         int flags = wxCOL_SORTABLE;

-        if ( m_grid->CanDragColSize() )
+        if ( m_grid->CanDragColSize(m_col) )

             flags |= wxCOL_RESIZABLE;
         if ( m_grid->CanDragColMove() )
             flags |= wxCOL_REORDERABLE;
             flags |= wxCOL_RESIZABLE;
         if ( m_grid->CanDragColMove() )
             flags |= wxCOL_REORDERABLE;


@@ -158,6 +158,15 @@ protected:
 private:
     wxGrid *GetOwner() const { return static_cast<wxGrid *>(GetParent()); }
 
 private:
     wxGrid *GetOwner() const { return static_cast<wxGrid *>(GetParent()); }
 

+    static wxMouseEvent GetDummyMouseEvent()
+    {
+        // make up a dummy event for the grid event to use -- unfortunately we
+        // can't do anything else here
+        wxMouseEvent e;
+        e.SetState(wxGetMouseState());
+        return e;
+    }
+

     // override the base class method to update our m_columns array
     virtual void OnColumnCountChanging(unsigned int count)
     {
     // override the base class method to update our m_columns array
     virtual void OnColumnCountChanging(unsigned int count)
     {


@@ -195,7 +204,8 @@ private:
 
         // as this is done by the user we should notify the main program about
         // it
 
         // as this is done by the user we should notify the main program about
         // it

-        GetOwner()->SendEvent(wxEVT_GRID_COL_SIZE, -1, idx);
+        GetOwner()->SendGridSizeEvent(wxEVT_GRID_COL_SIZE, -1, idx,
+                                      GetDummyMouseEvent());

     }
 
     // overridden to react to the columns order changes in the customization
     }
 
     // overridden to react to the columns order changes in the customization


@@ -209,9 +219,33 @@ private:
     // event handlers forwarding wxHeaderCtrl events to wxGrid
     void OnClick(wxHeaderCtrlEvent& event)
     {
     // event handlers forwarding wxHeaderCtrl events to wxGrid
     void OnClick(wxHeaderCtrlEvent& event)
     {

+        GetOwner()->SendEvent(wxEVT_GRID_LABEL_LEFT_CLICK,
+                              -1, event.GetColumn(),
+                              GetDummyMouseEvent());
+

         GetOwner()->DoColHeaderClick(event.GetColumn());
     }
 
         GetOwner()->DoColHeaderClick(event.GetColumn());
     }
 

+    void OnDoubleClick(wxHeaderCtrlEvent& event)
+    {
+        if ( !GetOwner()->SendEvent(wxEVT_GRID_LABEL_LEFT_DCLICK,
+                                    -1, event.GetColumn(),
+                                    GetDummyMouseEvent()) )
+        {
+            event.Skip();
+        }
+    }
+
+    void OnRightClick(wxHeaderCtrlEvent& event)
+    {
+        if ( !GetOwner()->SendEvent(wxEVT_GRID_LABEL_RIGHT_CLICK,
+                                    -1, event.GetColumn(),
+                                    GetDummyMouseEvent()) )
+        {
+            event.Skip();
+        }
+    }
+

     void OnBeginResize(wxHeaderCtrlEvent& event)
     {
         GetOwner()->DoStartResizeCol(event.GetColumn());
     void OnBeginResize(wxHeaderCtrlEvent& event)
     {
         GetOwner()->DoStartResizeCol(event.GetColumn());


@@ -226,7 +260,12 @@ private:
 
     void OnEndResize(wxHeaderCtrlEvent& event)
     {
 
     void OnEndResize(wxHeaderCtrlEvent& event)
     {

-        GetOwner()->DoEndDragResizeCol();
+        // we again need to pass a mouse event to be used for the grid event
+        // generation but we don't have it here so use a dummy one as in
+        // UpdateColumnVisibility()
+        wxMouseEvent e;
+        e.SetState(wxGetMouseState());
+        GetOwner()->DoEndDragResizeCol(e);

 
         event.Skip();
     }
 
         event.Skip();
     }


@@ -244,7 +283,7 @@ private:
     wxVector<wxGridHeaderColumn> m_columns;
 
     DECLARE_EVENT_TABLE()
     wxVector<wxGridHeaderColumn> m_columns;
 
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxGridHeaderCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxGridHeaderCtrl);

 };
 
 // common base class for various grid subwindows
 };
 
 // common base class for various grid subwindows


@@ -262,6 +301,8 @@ public:
         m_owner = owner;
     }
 
         m_owner = owner;
     }
 

+    virtual wxWindow *GetMainWindowOfCompositeControl() { return m_owner; }
+

     virtual bool AcceptsFocus() const { return false; }
 
     wxGrid *GetOwner() { return m_owner; }
     virtual bool AcceptsFocus() const { return false; }
 
     wxGrid *GetOwner() { return m_owner; }


@@ -272,7 +313,7 @@ protected:
     wxGrid *m_owner;
 
     DECLARE_EVENT_TABLE()
     wxGrid *m_owner;
 
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxGridSubwindow)
+    wxDECLARE_NO_COPY_CLASS(wxGridSubwindow);

 };
 
 class WXDLLIMPEXP_ADV wxGridRowLabelWindow : public wxGridSubwindow
 };
 
 class WXDLLIMPEXP_ADV wxGridRowLabelWindow : public wxGridSubwindow


@@ -290,7 +331,7 @@ private:
     void OnMouseWheel( wxMouseEvent& event );
 
     DECLARE_EVENT_TABLE()
     void OnMouseWheel( wxMouseEvent& event );
 
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxGridRowLabelWindow)
+    wxDECLARE_NO_COPY_CLASS(wxGridRowLabelWindow);

 };
 
 
 };
 
 


@@ -309,7 +350,7 @@ private:
     void OnMouseWheel( wxMouseEvent& event );
 
     DECLARE_EVENT_TABLE()
     void OnMouseWheel( wxMouseEvent& event );
 
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxGridColLabelWindow)
+    wxDECLARE_NO_COPY_CLASS(wxGridColLabelWindow);

 };
 
 
 };
 
 


@@ -327,7 +368,7 @@ private:
     void OnPaint( wxPaintEvent& event );
 
     DECLARE_EVENT_TABLE()
     void OnPaint( wxPaintEvent& event );
 
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxGridCornerLabelWindow)
+    wxDECLARE_NO_COPY_CLASS(wxGridCornerLabelWindow);

 };
 
 class WXDLLIMPEXP_ADV wxGridWindow : public wxGridSubwindow
 };
 
 class WXDLLIMPEXP_ADV wxGridWindow : public wxGridSubwindow


@@ -356,7 +397,7 @@ private:
     void OnFocus( wxFocusEvent& );
 
     DECLARE_EVENT_TABLE()
     void OnFocus( wxFocusEvent& );
 
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxGridWindow)
+    wxDECLARE_NO_COPY_CLASS(wxGridWindow);

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


@@ -497,16 +538,23 @@ public:
     // Set the row height or column width
     virtual void SetLineSize(wxGrid *grid, int line, int size) const = 0;
 
     // Set the row height or column width
     virtual void SetLineSize(wxGrid *grid, int line, int size) const = 0;
 

-    // True if rows/columns can be resized by user
-    virtual bool CanResizeLines(const wxGrid *grid) const = 0;
+    // Set the row default height or column default width
+    virtual void SetDefaultLineSize(wxGrid *grid, int size, bool resizeExisting) const = 0;

 
 
     // Return the index of the line at the given position
     //
     // NB: currently this is always identity for the rows as reordering is only
     //     implemented for the lines
 
 
     // Return the index of the line at the given position
     //
     // NB: currently this is always identity for the rows as reordering is only
     //     implemented for the lines

-    virtual int GetLineAt(const wxGrid *grid, int line) const = 0;
+    virtual int GetLineAt(const wxGrid *grid, int pos) const = 0;
+
+    // Return the display position of the line with the given index.
+    //
+    // NB: As GetLineAt(), currently this is always identity for rows.
+    virtual int GetLinePos(const wxGrid *grid, int line) const = 0;

 
 

+    // Return the index of the line just before the given one.
+    virtual int GetLineBefore(const wxGrid* grid, int line) const = 0;

 
     // Get the row or column label window
     virtual wxWindow *GetHeaderWindow(wxGrid *grid) const = 0;
 
     // Get the row or column label window
     virtual wxWindow *GetHeaderWindow(wxGrid *grid) const = 0;


@@ -569,12 +617,17 @@ public:
         { return grid->GetRowMinimalHeight(line); }
     virtual void SetLineSize(wxGrid *grid, int line, int size) const
         { grid->SetRowSize(line, size); }
         { return grid->GetRowMinimalHeight(line); }
     virtual void SetLineSize(wxGrid *grid, int line, int size) const
         { grid->SetRowSize(line, size); }

-    virtual bool CanResizeLines(const wxGrid *grid) const
-        { return grid->CanDragRowSize(); }
+    virtual void SetDefaultLineSize(wxGrid *grid, int size, bool resizeExisting) const
+        {  grid->SetDefaultRowSize(size, resizeExisting); }

 
 

-    virtual int GetLineAt(const wxGrid * WXUNUSED(grid), int line) const
+    virtual int GetLineAt(const wxGrid * WXUNUSED(grid), int pos) const
+        { return pos; } // TODO: implement row reordering
+    virtual int GetLinePos(const wxGrid * WXUNUSED(grid), int line) const

         { return line; } // TODO: implement row reordering
 
         { return line; } // TODO: implement row reordering
 

+    virtual int GetLineBefore(const wxGrid* WXUNUSED(grid), int line) const
+        { return line ? line - 1 : line; }
+

     virtual wxWindow *GetHeaderWindow(wxGrid *grid) const
         { return grid->GetGridRowLabelWindow(); }
     virtual int GetHeaderWindowSize(wxGrid *grid) const
     virtual wxWindow *GetHeaderWindow(wxGrid *grid) const
         { return grid->GetGridRowLabelWindow(); }
     virtual int GetHeaderWindowSize(wxGrid *grid) const


@@ -630,11 +683,16 @@ public:
         { return grid->GetColMinimalWidth(line); }
     virtual void SetLineSize(wxGrid *grid, int line, int size) const
         { grid->SetColSize(line, size); }
         { return grid->GetColMinimalWidth(line); }
     virtual void SetLineSize(wxGrid *grid, int line, int size) const
         { grid->SetColSize(line, size); }

-    virtual bool CanResizeLines(const wxGrid *grid) const
-        { return grid->CanDragColSize(); }
+    virtual void SetDefaultLineSize(wxGrid *grid, int size, bool resizeExisting) const
+        {  grid->SetDefaultColSize(size, resizeExisting); }

 
 

-    virtual int GetLineAt(const wxGrid *grid, int line) const
-        { return grid->GetColAt(line); }
+    virtual int GetLineAt(const wxGrid *grid, int pos) const
+        { return grid->GetColAt(pos); }
+    virtual int GetLinePos(const wxGrid *grid, int line) const
+        { return grid->GetColPos(line); }
+
+    virtual int GetLineBefore(const wxGrid* grid, int line) const
+        { return grid->GetColAt(wxMax(0, grid->GetColPos(line) - 1)); }

 
     virtual wxWindow *GetHeaderWindow(wxGrid *grid) const
         { return grid->GetGridColLabelWindow(); }
 
     virtual wxWindow *GetHeaderWindow(wxGrid *grid) const
         { return grid->GetGridColLabelWindow(); }


@@ -644,7 +702,10 @@ public:
 
 // This class abstracts the difference between operations going forward
 // (down/right) and backward (up/left) and allows to use the same code for
 
 // This class abstracts the difference between operations going forward
 // (down/right) and backward (up/left) and allows to use the same code for

-// functions which differ only in the direction of grid traversal
+// functions which differ only in the direction of grid traversal.
+//
+// Notice that all operations in this class work with display positions and not
+// internal indices which can be different if the columns were reordered.

 //
 // Like wxGridOperations it's an ABC with two concrete subclasses below. Unlike
 // it, this is a normal object and not just a function dispatch table and has a
 //
 // Like wxGridOperations it's an ABC with two concrete subclasses below. Unlike
 // it, this is a normal object and not just a function dispatch table and has a


@@ -673,6 +734,12 @@ public:
     // Find the line at the given distance, in pixels, away from this one
     // (this uses clipping, i.e. anything after the last line is counted as the
     // last one and anything before the first one as 0)
     // Find the line at the given distance, in pixels, away from this one
     // (this uses clipping, i.e. anything after the last line is counted as the
     // last one and anything before the first one as 0)

+    //
+    // TODO: Implementation of this method currently doesn't support column
+    //       reordering as it mixes up indices and positions. But this doesn't
+    //       really matter as it's only called for rows (Page Up/Down only work
+    //       vertically) and row reordering is not currently supported. We'd
+    //       need to fix it if this ever changes however.

     virtual int MoveByPixelDistance(int line, int distance) const = 0;
 
     // This class is never used polymorphically but give it a virtual dtor
     virtual int MoveByPixelDistance(int line, int distance) const = 0;
 
     // This class is never used polymorphically but give it a virtual dtor


@@ -680,6 +747,28 @@ public:
     virtual ~wxGridDirectionOperations() { }
 
 protected:
     virtual ~wxGridDirectionOperations() { }
 
 protected:

+    // Get the position of the row or column from the given coordinates pair.
+    //
+    // This is just a shortcut to avoid repeating m_oper and m_grid multiple
+    // times in the derived classes code.
+    int GetLinePos(const wxGridCellCoords& coords) const
+    {
+        return m_oper.GetLinePos(m_grid, m_oper.Select(coords));
+    }
+
+    // Get the index of the row or column from the position.
+    int GetLineAt(int pos) const
+    {
+        return m_oper.GetLineAt(m_grid, pos);
+    }
+
+    // Check if the given line is visible, i.e. has non 0 size.
+    bool IsLineVisible(int line) const
+    {
+        return m_oper.GetLineSize(m_grid, line) != 0;
+    }
+
+

     wxGrid * const m_grid;
     const wxGridOperations& m_oper;
 };
     wxGrid * const m_grid;
     const wxGridOperations& m_oper;
 };


@@ -696,14 +785,38 @@ public:
     {
         wxASSERT_MSG( m_oper.Select(coords) >= 0, "invalid row/column" );
 
     {
         wxASSERT_MSG( m_oper.Select(coords) >= 0, "invalid row/column" );
 

-        return m_oper.Select(coords) == 0;
+        int pos = GetLinePos(coords);
+        while ( pos )
+        {
+            // Check the previous line.
+            int line = GetLineAt(--pos);
+            if ( IsLineVisible(line) )
+            {
+                // There is another visible line before this one, hence it's
+                // not at boundary.
+                return false;
+            }
+        }
+
+        // We reached the boundary without finding any visible lines.
+        return true;

     }
 
     virtual void Advance(wxGridCellCoords& coords) const
     {
     }
 
     virtual void Advance(wxGridCellCoords& coords) const
     {

-        wxASSERT( !IsAtBoundary(coords) );
-
-        m_oper.Set(coords, m_oper.Select(coords) - 1);
+        int pos = GetLinePos(coords);
+        for ( ;; )
+        {
+            // This is not supposed to happen if IsAtBoundary() returned false.
+            wxCHECK_RET( pos, "can't advance when already at boundary" );
+
+            int line = GetLineAt(--pos);
+            if ( IsLineVisible(line) )
+            {
+                m_oper.Set(coords, line);
+                break;
+            }
+        }

     }
 
     virtual int MoveByPixelDistance(int line, int distance) const
     }
 
     virtual int MoveByPixelDistance(int line, int distance) const


@@ -713,6 +826,8 @@ public:
     }
 };
 
     }
 };
 

+// Please refer to the comments above when reading this class code, it's
+// absolutely symmetrical to wxGridBackwardOperations.

 class wxGridForwardOperations : public wxGridDirectionOperations
 {
 public:
 class wxGridForwardOperations : public wxGridDirectionOperations
 {
 public:


@@ -726,14 +841,32 @@ public:
     {
         wxASSERT_MSG( m_oper.Select(coords) < m_numLines, "invalid row/column" );
 
     {
         wxASSERT_MSG( m_oper.Select(coords) < m_numLines, "invalid row/column" );
 

-        return m_oper.Select(coords) == m_numLines - 1;
+        int pos = GetLinePos(coords);
+        while ( pos < m_numLines - 1 )
+        {
+            int line = GetLineAt(++pos);
+            if ( IsLineVisible(line) )
+                return false;
+        }
+
+        return true;

     }
 
     virtual void Advance(wxGridCellCoords& coords) const
     {
     }
 
     virtual void Advance(wxGridCellCoords& coords) const
     {

-        wxASSERT( !IsAtBoundary(coords) );
-
-        m_oper.Set(coords, m_oper.Select(coords) + 1);
+        int pos = GetLinePos(coords);
+        for ( ;; )
+        {
+            wxCHECK_RET( pos < m_numLines - 1,
+                         "can't advance when already at boundary" );
+
+            int line = GetLineAt(++pos);
+            if ( IsLineVisible(line) )
+            {
+                m_oper.Set(coords, line);
+                break;
+            }
+        }

     }
 
     virtual int MoveByPixelDistance(int line, int distance) const
     }
 
     virtual int MoveByPixelDistance(int line, int distance) const


@@ -746,23 +879,6 @@ private:
     const int m_numLines;
 };
 
     const int m_numLines;
 };
 

-// ----------------------------------------------------------------------------
-// private helpers
-// ----------------------------------------------------------------------------
-
-namespace
-{
-
-// ensure that first is less or equal to second, swapping the values if
-// necessary
-void EnsureFirstLessThanSecond(int& first, int& second)
-{
-    if ( first > second )
-        wxSwap(first, second);
-}
-
-} // anonymous namespace
-

 // ----------------------------------------------------------------------------
 // data structures used for the data type registry
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // data structures used for the data type registry
 // ----------------------------------------------------------------------------


@@ -785,7 +901,7 @@ struct wxGridDataTypeInfo
     wxGridCellRenderer* m_renderer;
     wxGridCellEditor*   m_editor;
 
     wxGridCellRenderer* m_renderer;
     wxGridCellEditor*   m_editor;
 

-    DECLARE_NO_COPY_CLASS(wxGridDataTypeInfo)
+    wxDECLARE_NO_COPY_CLASS(wxGridDataTypeInfo);

 };
 
 
 };