// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+/*
+ TODO:
+
+ - Replace use of wxINVERT with wxOverlay
+ - Make Begin/EndBatch() the same as the generic Freeze/Thaw()
+ - Review the column reordering code, it's a mess.
+ - Implement row reordering after dealing with the columns.
+ */
+
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#include "wx/spinctrl.h"
#include "wx/tokenzr.h"
#include "wx/renderer.h"
+#include "wx/headerctrl.h"
#include "wx/generic/gridsel.h"
-const wxChar wxGridNameStr[] = wxT("grid");
+const char wxGridNameStr[] = "grid";
#if defined(__WXMOTIF__)
#define WXUNUSED_MOTIF(identifier) WXUNUSED(identifier)
wxGridCellWithAttr(int row, int col, wxGridCellAttr *attr_)
: coords(row, col), attr(attr_)
{
+ wxASSERT( attr );
+ }
+
+ wxGridCellWithAttr(const wxGridCellWithAttr& other)
+ : coords(other.coords),
+ attr(other.attr)
+ {
+ attr->IncRef();
+ }
+
+ wxGridCellWithAttr& operator=(const wxGridCellWithAttr& other)
+ {
+ coords = other.coords;
+ if (attr != other.attr)
+ {
+ attr->DecRef();
+ attr = other.attr;
+ attr->IncRef();
+ }
+ return *this;
+ }
+
+ void ChangeAttr(wxGridCellAttr* new_attr)
+ {
+ if (attr != new_attr)
+ {
+ // "Delete" (i.e. DecRef) the old attribute.
+ attr->DecRef();
+ attr = new_attr;
+ // Take ownership of the new attribute, i.e. no IncRef.
+ }
}
~wxGridCellWithAttr()
wxGridCellCoords coords;
wxGridCellAttr *attr;
-
-// Cannot do this:
-// DECLARE_NO_COPY_CLASS(wxGridCellWithAttr)
-// without rewriting the macros, which require a public copy constructor.
};
WX_DECLARE_OBJARRAY_WITH_DECL(wxGridCellWithAttr, wxGridCellWithAttrArray,
DEFINE_EVENT_TYPE(wxEVT_GRID_ROW_SIZE)
DEFINE_EVENT_TYPE(wxEVT_GRID_COL_SIZE)
DEFINE_EVENT_TYPE(wxEVT_GRID_COL_MOVE)
+DEFINE_EVENT_TYPE(wxEVT_GRID_COL_SORT)
DEFINE_EVENT_TYPE(wxEVT_GRID_RANGE_SELECT)
-DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_CHANGE)
+DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_CHANGING)
+DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_CHANGED)
DEFINE_EVENT_TYPE(wxEVT_GRID_SELECT_CELL)
DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_SHOWN)
DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_HIDDEN)
// private classes
// ----------------------------------------------------------------------------
-class WXDLLIMPEXP_ADV wxGridRowLabelWindow : public wxWindow
+// header column providing access to the column information stored in wxGrid
+// via wxHeaderColumn interface
+class wxGridHeaderColumn : public wxHeaderColumn
+{
+public:
+ wxGridHeaderColumn(wxGrid *grid, int col)
+ : m_grid(grid),
+ m_col(col)
+ {
+ }
+
+ virtual wxString GetTitle() const { return m_grid->GetColLabelValue(m_col); }
+ virtual wxBitmap GetBitmap() const { return wxNullBitmap; }
+ virtual int GetWidth() const { return m_grid->GetColSize(m_col); }
+ virtual int GetMinWidth() const { return 0; }
+ virtual wxAlignment GetAlignment() const
+ {
+ int horz,
+ vert;
+ m_grid->GetColLabelAlignment(&horz, &vert);
+
+ return static_cast<wxAlignment>(horz);
+ }
+
+ virtual int GetFlags() const
+ {
+ // 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() )
+ flags |= wxCOL_RESIZABLE;
+ if ( m_grid->CanDragColMove() )
+ flags |= wxCOL_REORDERABLE;
+ if ( GetWidth() == 0 )
+ flags |= wxCOL_HIDDEN;
+
+ return flags;
+ }
+
+ virtual bool IsSortKey() const
+ {
+ return m_grid->IsSortingBy(m_col);
+ }
+
+ virtual bool IsSortOrderAscending() const
+ {
+ return m_grid->IsSortOrderAscending();
+ }
+
+private:
+ // these really should be const but are not because the column needs to be
+ // assignable to be used in a wxVector (in STL build, in non-STL build we
+ // avoid the need for this)
+ wxGrid *m_grid;
+ int m_col;
+};
+
+// header control retreiving column information from the grid
+class wxGridHeaderCtrl : public wxHeaderCtrl
{
public:
- wxGridRowLabelWindow() { m_owner = (wxGrid *)NULL; }
- wxGridRowLabelWindow( wxGrid *parent, wxWindowID id,
- const wxPoint &pos, const wxSize &size );
+ wxGridHeaderCtrl(wxGrid *owner)
+ : wxHeaderCtrl(owner,
+ wxID_ANY,
+ wxDefaultPosition,
+ wxDefaultSize,
+ wxHD_ALLOW_HIDE |
+ (owner->CanDragColMove() ? wxHD_ALLOW_REORDER : 0))
+ {
+ }
+
+protected:
+ virtual const wxHeaderColumn& GetColumn(unsigned int idx) const
+ {
+ return m_columns[idx];
+ }
private:
- wxGrid *m_owner;
+ wxGrid *GetOwner() const { return static_cast<wxGrid *>(GetParent()); }
+
+ // override the base class method to update our m_columns array
+ virtual void OnColumnCountChanging(unsigned int count)
+ {
+ const unsigned countOld = m_columns.size();
+ if ( count < countOld )
+ {
+ // just discard the columns which don't exist any more (notice that
+ // we can't use resize() here as it would require the vector
+ // value_type, i.e. wxGridHeaderColumn to be default constructible,
+ // which it is not)
+ m_columns.erase(m_columns.begin() + count, m_columns.end());
+ }
+ else // new columns added
+ {
+ // add columns for the new elements
+ for ( unsigned n = countOld; n < count; n++ )
+ m_columns.push_back(wxGridHeaderColumn(GetOwner(), n));
+ }
+ }
+
+ // override to implement column auto sizing
+ virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle)
+ {
+ // TODO: currently grid doesn't support computing the column best width
+ // from its contents so we just use the best label width as is
+ GetOwner()->SetColSize(idx, widthTitle);
+
+ return true;
+ }
+
+ // overridden to react to the actions using the columns popup menu
+ virtual void UpdateColumnVisibility(unsigned int idx, bool show)
+ {
+ GetOwner()->SetColSize(idx, show ? wxGRID_AUTOSIZE : 0);
+
+ // as this is done by the user we should notify the main program about
+ // it
+ GetOwner()->SendEvent(wxEVT_GRID_COL_SIZE, -1, idx);
+ }
+ // overridden to react to the columns order changes in the customization
+ // dialog
+ virtual void UpdateColumnsOrder(const wxArrayInt& order)
+ {
+ GetOwner()->SetColumnsOrder(order);
+ }
+
+
+ // event handlers forwarding wxHeaderCtrl events to wxGrid
+ void OnClick(wxHeaderCtrlEvent& event)
+ {
+ GetOwner()->DoColHeaderClick(event.GetColumn());
+ }
+
+ void OnBeginResize(wxHeaderCtrlEvent& event)
+ {
+ GetOwner()->DoStartResizeCol(event.GetColumn());
+
+ event.Skip();
+ }
+
+ void OnResizing(wxHeaderCtrlEvent& event)
+ {
+ GetOwner()->DoUpdateResizeColWidth(event.GetWidth());
+ }
+
+ void OnEndResize(wxHeaderCtrlEvent& event)
+ {
+ GetOwner()->DoEndDragResizeCol();
+
+ event.Skip();
+ }
+
+ void OnBeginReorder(wxHeaderCtrlEvent& event)
+ {
+ GetOwner()->DoStartMoveCol(event.GetColumn());
+ }
+
+ void OnEndReorder(wxHeaderCtrlEvent& event)
+ {
+ GetOwner()->DoEndMoveCol(event.GetNewOrder());
+ }
+
+ wxVector<wxGridHeaderColumn> m_columns;
+
+ DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxGridHeaderCtrl)
+};
+
+BEGIN_EVENT_TABLE(wxGridHeaderCtrl, wxHeaderCtrl)
+ EVT_HEADER_CLICK(wxID_ANY, wxGridHeaderCtrl::OnClick)
+
+ EVT_HEADER_BEGIN_RESIZE(wxID_ANY, wxGridHeaderCtrl::OnBeginResize)
+ EVT_HEADER_RESIZING(wxID_ANY, wxGridHeaderCtrl::OnResizing)
+ EVT_HEADER_END_RESIZE(wxID_ANY, wxGridHeaderCtrl::OnEndResize)
+
+ EVT_HEADER_BEGIN_REORDER(wxID_ANY, wxGridHeaderCtrl::OnBeginReorder)
+ EVT_HEADER_END_REORDER(wxID_ANY, wxGridHeaderCtrl::OnEndReorder)
+END_EVENT_TABLE()
+
+// common base class for various grid subwindows
+class WXDLLIMPEXP_ADV wxGridSubwindow : public wxWindow
+{
+public:
+ wxGridSubwindow(wxGrid *owner,
+ int additionalStyle = 0,
+ const wxString& name = wxPanelNameStr)
+ : wxWindow(owner, wxID_ANY,
+ wxDefaultPosition, wxDefaultSize,
+ wxBORDER_NONE | additionalStyle,
+ name)
+ {
+ m_owner = owner;
+ }
+
+ virtual bool AcceptsFocus() const { return false; }
+
+ wxGrid *GetOwner() { return m_owner; }
+
+protected:
+ void OnMouseCaptureLost(wxMouseCaptureLostEvent& event);
+
+ wxGrid *m_owner;
+
+ DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxGridSubwindow)
+};
+
+class WXDLLIMPEXP_ADV wxGridRowLabelWindow : public wxGridSubwindow
+{
+public:
+ wxGridRowLabelWindow(wxGrid *parent)
+ : wxGridSubwindow(parent)
+ {
+ }
+
+
+private:
void OnPaint( wxPaintEvent& event );
void OnMouseEvent( wxMouseEvent& event );
void OnMouseWheel( wxMouseEvent& event );
- void OnKeyDown( wxKeyEvent& event );
- void OnKeyUp( wxKeyEvent& );
- void OnChar( wxKeyEvent& );
- DECLARE_DYNAMIC_CLASS(wxGridRowLabelWindow)
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxGridRowLabelWindow)
};
-class WXDLLIMPEXP_ADV wxGridColLabelWindow : public wxWindow
+class WXDLLIMPEXP_ADV wxGridColLabelWindow : public wxGridSubwindow
{
public:
- wxGridColLabelWindow() { m_owner = (wxGrid *)NULL; }
- wxGridColLabelWindow( wxGrid *parent, wxWindowID id,
- const wxPoint &pos, const wxSize &size );
+ wxGridColLabelWindow(wxGrid *parent)
+ : wxGridSubwindow(parent)
+ {
+ }
-private:
- wxGrid *m_owner;
+private:
void OnPaint( wxPaintEvent& event );
void OnMouseEvent( wxMouseEvent& event );
void OnMouseWheel( wxMouseEvent& event );
- void OnKeyDown( wxKeyEvent& event );
- void OnKeyUp( wxKeyEvent& );
- void OnChar( wxKeyEvent& );
- DECLARE_DYNAMIC_CLASS(wxGridColLabelWindow)
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxGridColLabelWindow)
};
-class WXDLLIMPEXP_ADV wxGridCornerLabelWindow : public wxWindow
+class WXDLLIMPEXP_ADV wxGridCornerLabelWindow : public wxGridSubwindow
{
public:
- wxGridCornerLabelWindow() { m_owner = (wxGrid *)NULL; }
- wxGridCornerLabelWindow( wxGrid *parent, wxWindowID id,
- const wxPoint &pos, const wxSize &size );
+ wxGridCornerLabelWindow(wxGrid *parent)
+ : wxGridSubwindow(parent)
+ {
+ }
private:
- wxGrid *m_owner;
-
void OnMouseEvent( wxMouseEvent& event );
void OnMouseWheel( wxMouseEvent& event );
- void OnKeyDown( wxKeyEvent& event );
- void OnKeyUp( wxKeyEvent& );
- void OnChar( wxKeyEvent& );
void OnPaint( wxPaintEvent& event );
- DECLARE_DYNAMIC_CLASS(wxGridCornerLabelWindow)
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxGridCornerLabelWindow)
};
-class WXDLLIMPEXP_ADV wxGridWindow : public wxWindow
+class WXDLLIMPEXP_ADV wxGridWindow : public wxGridSubwindow
{
public:
- wxGridWindow()
+ wxGridWindow(wxGrid *parent)
+ : wxGridSubwindow(parent,
+ wxWANTS_CHARS | wxCLIP_CHILDREN,
+ "GridWindow")
{
- m_owner = NULL;
- m_rowLabelWin = NULL;
- m_colLabelWin = NULL;
}
- wxGridWindow( wxGrid *parent,
- wxGridRowLabelWindow *rowLblWin,
- wxGridColLabelWindow *colLblWin,
- wxWindowID id, const wxPoint &pos, const wxSize &size );
- virtual ~wxGridWindow() {}
- void ScrollWindow( int dx, int dy, const wxRect *rect );
+ virtual void ScrollWindow( int dx, int dy, const wxRect *rect );
- wxGrid* GetOwner() { return m_owner; }
+ virtual bool AcceptsFocus() const { return true; }
private:
- wxGrid *m_owner;
- wxGridRowLabelWindow *m_rowLabelWin;
- wxGridColLabelWindow *m_colLabelWin;
-
void OnPaint( wxPaintEvent &event );
void OnMouseWheel( wxMouseEvent& event );
void OnMouseEvent( wxMouseEvent& event );
void OnEraseBackground( wxEraseEvent& );
void OnFocus( wxFocusEvent& );
- DECLARE_DYNAMIC_CLASS(wxGridWindow)
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxGridWindow)
};
class WXDLLIMPEXP_ADV wxGridTypeRegistry
{
public:
- wxGridTypeRegistry() {}
+ wxGridTypeRegistry() {}
~wxGridTypeRegistry();
void RegisterDataType(const wxString& typeName,
wxGridDataTypeInfoArray m_typeinfo;
};
-
// ----------------------------------------------------------------------------
-// conditional compilation
+// operations classes abstracting the difference between operating on rows and
+// columns
// ----------------------------------------------------------------------------
-#ifndef WXGRID_DRAW_LINES
-#define WXGRID_DRAW_LINES 1
-#endif
+// This class allows to write a function only once because by using its methods
+// it will apply to both columns and rows.
+//
+// This is an abstract interface definition, the two concrete implementations
+// below should be used when working with rows and columns respectively.
+class wxGridOperations
+{
+public:
+ // Returns the operations in the other direction, i.e. wxGridRowOperations
+ // if this object is a wxGridColumnOperations and vice versa.
+ virtual wxGridOperations& Dual() const = 0;
+
+ // Return the number of rows or columns.
+ virtual int GetNumberOfLines(const wxGrid *grid) const = 0;
+
+ // Return the selection mode which allows selecting rows or columns.
+ virtual wxGrid::wxGridSelectionModes GetSelectionMode() const = 0;
+
+ // Make a wxGridCellCoords from the given components: thisDir is row or
+ // column and otherDir is column or row
+ virtual wxGridCellCoords MakeCoords(int thisDir, int otherDir) const = 0;
+
+ // Calculate the scrolled position of the given abscissa or ordinate.
+ virtual int CalcScrolledPosition(wxGrid *grid, int pos) const = 0;
+
+ // Selects the horizontal or vertical component from the given object.
+ virtual int Select(const wxGridCellCoords& coords) const = 0;
+ virtual int Select(const wxPoint& pt) const = 0;
+ virtual int Select(const wxSize& sz) const = 0;
+ virtual int Select(const wxRect& r) const = 0;
+ virtual int& Select(wxRect& r) const = 0;
+
+ // Returns width or height of the rectangle
+ virtual int& SelectSize(wxRect& r) const = 0;
+
+ // Make a wxSize such that Select() applied to it returns first component
+ virtual wxSize MakeSize(int first, int second) const = 0;
+
+ // Sets the row or column component of the given cell coordinates
+ virtual void Set(wxGridCellCoords& coords, int line) const = 0;
+
+
+ // Draws a line parallel to the row or column, i.e. horizontal or vertical:
+ // pos is the horizontal or vertical position of the line and start and end
+ // are the coordinates of the line extremities in the other direction
+ virtual void
+ DrawParallelLine(wxDC& dc, int start, int end, int pos) const = 0;
+
+ // Draw a horizontal or vertical line across the given rectangle
+ // (this is implemented in terms of above and uses Select() to extract
+ // start and end from the given rectangle)
+ void DrawParallelLineInRect(wxDC& dc, const wxRect& rect, int pos) const
+ {
+ const int posStart = Select(rect.GetPosition());
+ DrawParallelLine(dc, posStart, posStart + Select(rect.GetSize()), pos);
+ }
+
+
+ // Return the index of the row or column at the given pixel coordinate.
+ virtual int
+ PosToLine(const wxGrid *grid, int pos, bool clip = false) const = 0;
+
+ // Get the top/left position, in pixels, of the given row or column
+ virtual int GetLineStartPos(const wxGrid *grid, int line) const = 0;
+
+ // Get the bottom/right position, in pixels, of the given row or column
+ virtual int GetLineEndPos(const wxGrid *grid, int line) const = 0;
+
+ // Get the height/width of the given row/column
+ virtual int GetLineSize(const wxGrid *grid, int line) const = 0;
+
+ // Get wxGrid::m_rowBottoms/m_colRights array
+ virtual const wxArrayInt& GetLineEnds(const wxGrid *grid) const = 0;
+
+ // Get default height row height or column width
+ virtual int GetDefaultLineSize(const wxGrid *grid) const = 0;
+
+ // Return the minimal acceptable row height or column width
+ virtual int GetMinimalAcceptableLineSize(const wxGrid *grid) const = 0;
+
+ // Return the minimal row height or column width
+ virtual int GetMinimalLineSize(const wxGrid *grid, int line) 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;
+
+
+ // 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;
+
+
+ // Get the row or column label window
+ virtual wxWindow *GetHeaderWindow(wxGrid *grid) const = 0;
+
+ // Get the width or height of the row or column label window
+ virtual int GetHeaderWindowSize(wxGrid *grid) const = 0;
+
+
+ // This class is never used polymorphically but give it a virtual dtor
+ // anyhow to suppress g++ complaints about it
+ virtual ~wxGridOperations() { }
+};
+
+class wxGridRowOperations : public wxGridOperations
+{
+public:
+ virtual wxGridOperations& Dual() const;
+
+ virtual int GetNumberOfLines(const wxGrid *grid) const
+ { return grid->GetNumberRows(); }
+
+ virtual wxGrid::wxGridSelectionModes GetSelectionMode() const
+ { return wxGrid::wxGridSelectRows; }
+
+ virtual wxGridCellCoords MakeCoords(int thisDir, int otherDir) const
+ { return wxGridCellCoords(thisDir, otherDir); }
+
+ virtual int CalcScrolledPosition(wxGrid *grid, int pos) const
+ { return grid->CalcScrolledPosition(wxPoint(pos, 0)).x; }
+
+ virtual int Select(const wxGridCellCoords& c) const { return c.GetRow(); }
+ virtual int Select(const wxPoint& pt) const { return pt.x; }
+ virtual int Select(const wxSize& sz) const { return sz.x; }
+ virtual int Select(const wxRect& r) const { return r.x; }
+ virtual int& Select(wxRect& r) const { return r.x; }
+ virtual int& SelectSize(wxRect& r) const { return r.width; }
+ virtual wxSize MakeSize(int first, int second) const
+ { return wxSize(first, second); }
+ virtual void Set(wxGridCellCoords& coords, int line) const
+ { coords.SetRow(line); }
+
+ virtual void DrawParallelLine(wxDC& dc, int start, int end, int pos) const
+ { dc.DrawLine(start, pos, end, pos); }
+
+ virtual int PosToLine(const wxGrid *grid, int pos, bool clip = false) const
+ { return grid->YToRow(pos, clip); }
+ virtual int GetLineStartPos(const wxGrid *grid, int line) const
+ { return grid->GetRowTop(line); }
+ virtual int GetLineEndPos(const wxGrid *grid, int line) const
+ { return grid->GetRowBottom(line); }
+ virtual int GetLineSize(const wxGrid *grid, int line) const
+ { return grid->GetRowHeight(line); }
+ virtual const wxArrayInt& GetLineEnds(const wxGrid *grid) const
+ { return grid->m_rowBottoms; }
+ virtual int GetDefaultLineSize(const wxGrid *grid) const
+ { return grid->GetDefaultRowSize(); }
+ virtual int GetMinimalAcceptableLineSize(const wxGrid *grid) const
+ { return grid->GetRowMinimalAcceptableHeight(); }
+ virtual int GetMinimalLineSize(const wxGrid *grid, int line) const
+ { 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 int GetLineAt(const wxGrid * WXUNUSED(grid), int line) const
+ { return line; } // TODO: implement row reordering
+
+ virtual wxWindow *GetHeaderWindow(wxGrid *grid) const
+ { return grid->GetGridRowLabelWindow(); }
+ virtual int GetHeaderWindowSize(wxGrid *grid) const
+ { return grid->GetRowLabelSize(); }
+};
+
+class wxGridColumnOperations : public wxGridOperations
+{
+public:
+ virtual wxGridOperations& Dual() const;
+
+ virtual int GetNumberOfLines(const wxGrid *grid) const
+ { return grid->GetNumberCols(); }
+
+ virtual wxGrid::wxGridSelectionModes GetSelectionMode() const
+ { return wxGrid::wxGridSelectColumns; }
+
+ virtual wxGridCellCoords MakeCoords(int thisDir, int otherDir) const
+ { return wxGridCellCoords(otherDir, thisDir); }
+
+ virtual int CalcScrolledPosition(wxGrid *grid, int pos) const
+ { return grid->CalcScrolledPosition(wxPoint(0, pos)).y; }
+
+ virtual int Select(const wxGridCellCoords& c) const { return c.GetCol(); }
+ virtual int Select(const wxPoint& pt) const { return pt.y; }
+ virtual int Select(const wxSize& sz) const { return sz.y; }
+ virtual int Select(const wxRect& r) const { return r.y; }
+ virtual int& Select(wxRect& r) const { return r.y; }
+ virtual int& SelectSize(wxRect& r) const { return r.height; }
+ virtual wxSize MakeSize(int first, int second) const
+ { return wxSize(second, first); }
+ virtual void Set(wxGridCellCoords& coords, int line) const
+ { coords.SetCol(line); }
+
+ virtual void DrawParallelLine(wxDC& dc, int start, int end, int pos) const
+ { dc.DrawLine(pos, start, pos, end); }
+
+ virtual int PosToLine(const wxGrid *grid, int pos, bool clip = false) const
+ { return grid->XToCol(pos, clip); }
+ virtual int GetLineStartPos(const wxGrid *grid, int line) const
+ { return grid->GetColLeft(line); }
+ virtual int GetLineEndPos(const wxGrid *grid, int line) const
+ { return grid->GetColRight(line); }
+ virtual int GetLineSize(const wxGrid *grid, int line) const
+ { return grid->GetColWidth(line); }
+ virtual const wxArrayInt& GetLineEnds(const wxGrid *grid) const
+ { return grid->m_colRights; }
+ virtual int GetDefaultLineSize(const wxGrid *grid) const
+ { return grid->GetDefaultColSize(); }
+ virtual int GetMinimalAcceptableLineSize(const wxGrid *grid) const
+ { return grid->GetColMinimalAcceptableWidth(); }
+ virtual int GetMinimalLineSize(const wxGrid *grid, int line) const
+ { 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 int GetLineAt(const wxGrid *grid, int line) const
+ { return grid->GetColAt(line); }
+
+ virtual wxWindow *GetHeaderWindow(wxGrid *grid) const
+ { return grid->GetGridColLabelWindow(); }
+ virtual int GetHeaderWindowSize(wxGrid *grid) const
+ { return grid->GetColLabelSize(); }
+};
+
+wxGridOperations& wxGridRowOperations::Dual() const
+{
+ static wxGridColumnOperations s_colOper;
+
+ return s_colOper;
+}
+
+wxGridOperations& wxGridColumnOperations::Dual() const
+{
+ static wxGridRowOperations s_rowOper;
+
+ return s_rowOper;
+}
+
+// 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
+//
+// 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
+// non-default ctor.
+//
+// Note: the explanation of this discrepancy is the existence of (very useful)
+// Dual() method in wxGridOperations which forces us to make wxGridOperations a
+// function dispatcher only.
+class wxGridDirectionOperations
+{
+public:
+ // The oper parameter to ctor selects whether we work with rows or columns
+ wxGridDirectionOperations(wxGrid *grid, const wxGridOperations& oper)
+ : m_grid(grid),
+ m_oper(oper)
+ {
+ }
+
+ // Check if the component of this point in our direction is at the
+ // boundary, i.e. is the first/last row/column
+ virtual bool IsAtBoundary(const wxGridCellCoords& coords) const = 0;
+
+ // Increment the component of this point in our direction
+ virtual void Advance(wxGridCellCoords& coords) const = 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)
+ virtual int MoveByPixelDistance(int line, int distance) const = 0;
+
+ // This class is never used polymorphically but give it a virtual dtor
+ // anyhow to suppress g++ complaints about it
+ virtual ~wxGridDirectionOperations() { }
+
+protected:
+ wxGrid * const m_grid;
+ const wxGridOperations& m_oper;
+};
+
+class wxGridBackwardOperations : public wxGridDirectionOperations
+{
+public:
+ wxGridBackwardOperations(wxGrid *grid, const wxGridOperations& oper)
+ : wxGridDirectionOperations(grid, oper)
+ {
+ }
+
+ virtual bool IsAtBoundary(const wxGridCellCoords& coords) const
+ {
+ wxASSERT_MSG( m_oper.Select(coords) >= 0, "invalid row/column" );
+
+ return m_oper.Select(coords) == 0;
+ }
+
+ virtual void Advance(wxGridCellCoords& coords) const
+ {
+ wxASSERT( !IsAtBoundary(coords) );
+
+ m_oper.Set(coords, m_oper.Select(coords) - 1);
+ }
+
+ virtual int MoveByPixelDistance(int line, int distance) const
+ {
+ int pos = m_oper.GetLineStartPos(m_grid, line);
+ return m_oper.PosToLine(m_grid, pos - distance + 1, true);
+ }
+};
+
+class wxGridForwardOperations : public wxGridDirectionOperations
+{
+public:
+ wxGridForwardOperations(wxGrid *grid, const wxGridOperations& oper)
+ : wxGridDirectionOperations(grid, oper),
+ m_numLines(oper.GetNumberOfLines(grid))
+ {
+ }
+
+ virtual bool IsAtBoundary(const wxGridCellCoords& coords) const
+ {
+ wxASSERT_MSG( m_oper.Select(coords) < m_numLines, "invalid row/column" );
+
+ return m_oper.Select(coords) == m_numLines - 1;
+ }
+
+ virtual void Advance(wxGridCellCoords& coords) const
+ {
+ wxASSERT( !IsAtBoundary(coords) );
+
+ m_oper.Set(coords, m_oper.Select(coords) + 1);
+ }
+
+ virtual int MoveByPixelDistance(int line, int distance) const
+ {
+ int pos = m_oper.GetLineStartPos(m_grid, line);
+ return m_oper.PosToLine(m_grid, pos + distance, true);
+ }
+
+private:
+ const int m_numLines;
+};
// ----------------------------------------------------------------------------
// globals
wxGridCellCoords wxGridNoCellCoords( -1, -1 );
wxRect wxGridNoCellRect( -1, -1, -1, -1 );
+namespace
+{
+
// scroll line size
-// TODO: this doesn't work at all, grid cells have different sizes and approx
-// calculations don't work as because of the size mismatch scrollbars
-// sometimes fail to be shown when they should be or vice versa
-//
-// The scroll bars may be a little flakey once in a while, but that is
-// surely much less horrible than having scroll lines of only 1!!!
-// -- Robin
-//
-// Well, it's still seriously broken so it might be better but needs
-// fixing anyhow
-// -- Vadim
-static const size_t GRID_SCROLL_LINE_X = 15; // 1;
-static const size_t GRID_SCROLL_LINE_Y = GRID_SCROLL_LINE_X;
+const size_t GRID_SCROLL_LINE_X = 15;
+const size_t GRID_SCROLL_LINE_Y = GRID_SCROLL_LINE_X;
// the size of hash tables used a bit everywhere (the max number of elements
// in these hash tables is the number of rows/columns)
-static const int GRID_HASH_SIZE = 100;
+const int GRID_HASH_SIZE = 100;
+
+// the minimal distance in pixels the mouse needs to move to start a drag
+// operation
+const int DRAG_SENSITIVITY = 3;
+
+} // anonymous namespace
-#if 0
// ----------------------------------------------------------------------------
-// private functions
+// private helpers
// ----------------------------------------------------------------------------
-static inline int GetScrollX(int x)
+namespace
{
- return (x + GRID_SCROLL_LINE_X - 1) / GRID_SCROLL_LINE_X;
-}
-static inline int GetScrollY(int y)
+// ensure that first is less or equal to second, swapping the values if
+// necessary
+void EnsureFirstLessThanSecond(int& first, int& second)
{
- return (y + GRID_SCROLL_LINE_Y - 1) / GRID_SCROLL_LINE_Y;
+ if ( first > second )
+ wxSwap(first, second);
}
-#endif
+
+} // anonymous namespace
// ============================================================================
// implementation
gridWindow->GetOwner()->PrepareDC(dc);
dc.SetPen(*wxTRANSPARENT_PEN);
- dc.SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));
+ dc.SetBrush(wxBrush(attr->GetBackgroundColour()));
dc.DrawRectangle(rectCell);
// redraw the control we just painted over
if ((ctrl || alt) && !(ctrl && alt))
return false;
- int key = 0;
- bool keyOk = true;
-
-#ifdef __WXGTK20__
- // If it's a F-Key or other special key then it shouldn't start the
- // editor.
- if (event.GetKeyCode() >= WXK_START)
- return false;
-#endif
#if wxUSE_UNICODE
// if the unicode key code is not really a unicode character (it may
// be a function key or etc., the platforms appear to always give us a
// small value in this case) then fallback to the ASCII key code but
// don't do anything for function keys or etc.
- key = event.GetUnicodeKey();
- if (key <= 127)
- {
- key = event.GetKeyCode();
- keyOk = (key <= 127);
- }
+ if ( event.GetUnicodeKey() > 127 && event.GetKeyCode() > 127 )
+ return false;
#else
- key = event.GetKeyCode();
- keyOk = (key <= 255);
+ if ( event.GetKeyCode() > 255 )
+ return false;
#endif
- return keyOk;
+ return true;
}
void wxGridCellEditor::StartingKey(wxKeyEvent& event)
wxWindowID id,
wxEvtHandler* evtHandler)
{
- m_control = new wxTextCtrl(parent, id, wxEmptyString,
- wxDefaultPosition, wxDefaultSize
-#if defined(__WXMSW__)
- , wxTE_PROCESS_TAB | wxTE_AUTO_SCROLL | wxNO_BORDER
-#endif
- );
+ DoCreate(parent, id, evtHandler);
+}
+
+void wxGridCellTextEditor::DoCreate(wxWindow* parent,
+ wxWindowID id,
+ wxEvtHandler* evtHandler,
+ long style)
+{
+ style |= wxTE_PROCESS_ENTER | wxTE_PROCESS_TAB | wxNO_BORDER;
+
+ m_control = new wxTextCtrl(parent, id, wxEmptyString,
+ wxDefaultPosition, wxDefaultSize,
+ style);
// set max length allowed in the textctrl, if the parameter was set
- if (m_maxChars != 0)
+ if ( m_maxChars != 0 )
{
- ((wxTextCtrl*)m_control)->SetMaxLength(m_maxChars);
+ Text()->SetMaxLength(m_maxChars);
}
wxGridCellEditor::Create(parent, id, evtHandler);
{
wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be created first!"));
- m_startValue = grid->GetTable()->GetValue(row, col);
+ m_value = grid->GetTable()->GetValue(row, col);
- DoBeginEdit(m_startValue);
+ DoBeginEdit(m_value);
}
void wxGridCellTextEditor::DoBeginEdit(const wxString& startValue)
Text()->SetFocus();
}
-bool wxGridCellTextEditor::EndEdit(int row, int col, wxGrid* grid)
+bool wxGridCellTextEditor::EndEdit(const wxString& WXUNUSED(oldval),
+ wxString *newval)
{
- wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be created first!"));
+ wxCHECK_MSG( m_control, false,
+ "wxGridCellTextEditor must be created first!" );
- bool changed = false;
- wxString value = Text()->GetValue();
- if (value != m_startValue)
- changed = true;
+ const wxString value = Text()->GetValue();
+ if ( value == m_value )
+ return false;
- if (changed)
- grid->GetTable()->SetValue(row, col, value);
+ m_value = value;
- m_startValue = wxEmptyString;
+ if ( newval )
+ *newval = m_value;
- // No point in setting the text of the hidden control
- //Text()->SetValue(m_startValue);
+ return true;
+}
- return changed;
+void wxGridCellTextEditor::ApplyEdit(int row, int col, wxGrid* grid)
+{
+ grid->GetTable()->SetValue(row, col, m_value);
+ m_value.clear();
}
void wxGridCellTextEditor::Reset()
{
- wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be created first!"));
+ wxASSERT_MSG( m_control, "wxGridCellTextEditor must be created first!" );
- DoReset(m_startValue);
+ DoReset(m_value);
}
void wxGridCellTextEditor::DoReset(const wxString& startValue)
wxGridTableBase *table = grid->GetTable();
if ( table->CanGetValueAs(row, col, wxGRID_VALUE_NUMBER) )
{
- m_valueOld = table->GetValueAsLong(row, col);
+ m_value = table->GetValueAsLong(row, col);
}
else
{
- m_valueOld = 0;
+ m_value = 0;
wxString sValue = table->GetValue(row, col);
- if (! sValue.ToLong(&m_valueOld) && ! sValue.empty())
+ if (! sValue.ToLong(&m_value) && ! sValue.empty())
{
wxFAIL_MSG( _T("this cell doesn't have numeric value") );
return;
#if wxUSE_SPINCTRL
if ( HasRange() )
{
- Spin()->SetValue((int)m_valueOld);
+ Spin()->SetValue((int)m_value);
Spin()->SetFocus();
}
else
}
}
-bool wxGridCellNumberEditor::EndEdit(int row, int col,
- wxGrid* grid)
+bool wxGridCellNumberEditor::EndEdit(const wxString& oldval, wxString *newval)
{
- bool changed;
long value = 0;
wxString text;
if ( HasRange() )
{
value = Spin()->GetValue();
- changed = value != m_valueOld;
- if (changed)
- text = wxString::Format(wxT("%ld"), value);
+ if ( value == m_value )
+ return false;
+
+ text.Printf(wxT("%ld"), value);
}
- else
-#endif
+ else // using unconstrained input
+#endif // wxUSE_SPINCTRL
{
text = Text()->GetValue();
- changed = (text.empty() || text.ToLong(&value)) && (value != m_valueOld);
- }
+ if ( text.empty() )
+ {
+ if ( oldval.empty() )
+ return false;
+ }
+ else // non-empty text now (maybe 0)
+ {
+ if ( !text.ToLong(&value) )
+ return false;
- if ( changed )
- {
- if (grid->GetTable()->CanSetValueAs(row, col, wxGRID_VALUE_NUMBER))
- grid->GetTable()->SetValueAsLong(row, col, value);
- else
- grid->GetTable()->SetValue(row, col, text);
+ // if value == m_value == 0 but old text was "" and new one is
+ // "0" something still did change
+ if ( value == m_value && (value || !oldval.empty()) )
+ return false;
+ }
}
- return changed;
+ m_value = value;
+
+ if ( newval )
+ *newval = text;
+
+ return true;
+}
+
+void wxGridCellNumberEditor::ApplyEdit(int row, int col, wxGrid* grid)
+{
+ wxGridTableBase * const table = grid->GetTable();
+ if ( table->CanSetValueAs(row, col, wxGRID_VALUE_NUMBER) )
+ table->SetValueAsLong(row, col, m_value);
+ else
+ table->SetValue(row, col, wxString::Format("%ld", m_value));
}
void wxGridCellNumberEditor::Reset()
#if wxUSE_SPINCTRL
if ( HasRange() )
{
- Spin()->SetValue((int)m_valueOld);
+ Spin()->SetValue((int)m_value);
}
else
#endif
void wxGridCellFloatEditor::BeginEdit(int row, int col, wxGrid* grid)
{
// first get the value
- wxGridTableBase *table = grid->GetTable();
+ wxGridTableBase * const table = grid->GetTable();
if ( table->CanGetValueAs(row, col, wxGRID_VALUE_FLOAT) )
{
- m_valueOld = table->GetValueAsDouble(row, col);
+ m_value = table->GetValueAsDouble(row, col);
}
else
{
- m_valueOld = 0.0;
- wxString sValue = table->GetValue(row, col);
- if (! sValue.ToDouble(&m_valueOld) && ! sValue.empty())
+ m_value = 0.0;
+
+ const wxString value = table->GetValue(row, col);
+ if ( !value.empty() )
{
- wxFAIL_MSG( _T("this cell doesn't have float value") );
- return;
+ if ( !value.ToDouble(&m_value) )
+ {
+ wxFAIL_MSG( _T("this cell doesn't have float value") );
+ return;
+ }
}
}
DoBeginEdit(GetString());
}
-bool wxGridCellFloatEditor::EndEdit(int row, int col,
- wxGrid* grid)
+bool wxGridCellFloatEditor::EndEdit(const wxString& oldval, wxString *newval)
{
- double value = 0.0;
- wxString text(Text()->GetValue());
+ const wxString text(Text()->GetValue());
- if ( (text.empty() || text.ToDouble(&value)) &&
- !wxIsSameDouble(value, m_valueOld) )
+ double value;
+ if ( !text.empty() )
{
- if (grid->GetTable()->CanSetValueAs(row, col, wxGRID_VALUE_FLOAT))
- grid->GetTable()->SetValueAsDouble(row, col, value);
- else
- grid->GetTable()->SetValue(row, col, text);
+ if ( !text.ToDouble(&value) )
+ return false;
+ }
+ else // new value is empty string
+ {
+ if ( oldval.empty() )
+ return false; // nothing changed
- return true;
+ value = 0.;
}
- return false;
+ // the test for empty strings ensures that we don't skip the value setting
+ // when "" is replaced by "0" or vice versa as "" numeric value is also 0.
+ if ( wxIsSameDouble(value, m_value) && !text.empty() && !oldval.empty() )
+ return false; // nothing changed
+
+ m_value = value;
+
+ if ( newval )
+ *newval = text;
+
+ return true;
+}
+
+void wxGridCellFloatEditor::ApplyEdit(int row, int col, wxGrid* grid)
+{
+ wxGridTableBase * const table = grid->GetTable();
+
+ if ( table->CanSetValueAs(row, col, wxGRID_VALUE_FLOAT) )
+ table->SetValueAsDouble(row, col, m_value);
+ else
+ table->SetValue(row, col, Text()->GetValue());
}
void wxGridCellFloatEditor::Reset()
fmt = _T("%f");
}
- return wxString::Format(fmt, m_valueOld);
+ return wxString::Format(fmt, m_value);
}
bool wxGridCellFloatEditor::IsAcceptedKey(wxKeyEvent& event)
if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL))
{
- m_startValue = grid->GetTable()->GetValueAsBool(row, col);
+ m_value = grid->GetTable()->GetValueAsBool(row, col);
}
else
{
wxString cellval( grid->GetTable()->GetValue(row, col) );
if ( cellval == ms_stringValues[false] )
- m_startValue = false;
+ m_value = false;
else if ( cellval == ms_stringValues[true] )
- m_startValue = true;
+ m_value = true;
else
{
// do not try to be smart here and convert it to true or false
}
}
- CBox()->SetValue(m_startValue);
+ CBox()->SetValue(m_value);
CBox()->SetFocus();
}
-bool wxGridCellBoolEditor::EndEdit(int row, int col,
- wxGrid* grid)
+bool wxGridCellBoolEditor::EndEdit(const wxString& WXUNUSED(oldval),
+ wxString *newval)
{
- wxASSERT_MSG(m_control,
- wxT("The wxGridCellEditor must be created first!"));
-
- bool changed = false;
bool value = CBox()->GetValue();
- if ( value != m_startValue )
- changed = true;
+ if ( value == m_value )
+ return false;
- if ( changed )
- {
- wxGridTableBase * const table = grid->GetTable();
- if ( table->CanGetValueAs(row, col, wxGRID_VALUE_BOOL) )
- table->SetValueAsBool(row, col, value);
- else
- table->SetValue(row, col, GetValue());
- }
+ m_value = value;
+
+ if ( newval )
+ *newval = GetValue();
+
+ return true;
+}
- return changed;
+void wxGridCellBoolEditor::ApplyEdit(int row, int col, wxGrid* grid)
+{
+ wxGridTableBase * const table = grid->GetTable();
+ if ( table->CanSetValueAs(row, col, wxGRID_VALUE_BOOL) )
+ table->SetValueAsBool(row, col, m_value);
+ else
+ table->SetValue(row, col, GetValue());
}
void wxGridCellBoolEditor::Reset()
wxASSERT_MSG(m_control,
wxT("The wxGridCellEditor must be created first!"));
- CBox()->SetValue(m_startValue);
+ CBox()->SetValue(m_value);
}
void wxGridCellBoolEditor::StartingClick()
wxWindowID id,
wxEvtHandler* evtHandler)
{
+ int style = wxTE_PROCESS_ENTER |
+ wxTE_PROCESS_TAB |
+ wxBORDER_NONE;
+
+ if ( !m_allowOthers )
+ style |= wxCB_READONLY;
m_control = new wxComboBox(parent, id, wxEmptyString,
wxDefaultPosition, wxDefaultSize,
m_choices,
- m_allowOthers ? 0 : wxCB_READONLY);
+ style);
wxGridCellEditor::Create(parent, id, evtHandler);
}
if (evtHandler)
evtHandler->SetInSetFocus(true);
- m_startValue = grid->GetTable()->GetValue(row, col);
+ m_value = grid->GetTable()->GetValue(row, col);
- if (m_allowOthers)
- {
- Combo()->SetValue(m_startValue);
- }
- else
- {
- // find the right position, or default to the first if not found
- int pos = Combo()->FindString(m_startValue);
- if (pos == wxNOT_FOUND)
- pos = 0;
- Combo()->SetSelection(pos);
- }
+ Reset(); // this updates combo box to correspond to m_value
- Combo()->SetInsertionPointEnd();
Combo()->SetFocus();
if (evtHandler)
}
}
-bool wxGridCellChoiceEditor::EndEdit(int row, int col,
- wxGrid* grid)
+bool wxGridCellChoiceEditor::EndEdit(const wxString& WXUNUSED(oldval),
+ wxString *newval)
{
- wxString value = Combo()->GetValue();
- if ( value == m_startValue )
+ const wxString value = Combo()->GetValue();
+ if ( value == m_value )
return false;
- grid->GetTable()->SetValue(row, col, value);
+ m_value = value;
+
+ if ( newval )
+ *newval = value;
return true;
}
+void wxGridCellChoiceEditor::ApplyEdit(int row, int col, wxGrid* grid)
+{
+ grid->GetTable()->SetValue(row, col, m_value);
+}
+
void wxGridCellChoiceEditor::Reset()
{
- Combo()->SetValue(m_startValue);
- Combo()->SetInsertionPointEnd();
+ if (m_allowOthers)
+ {
+ Combo()->SetValue(m_value);
+ Combo()->SetInsertionPointEnd();
+ }
+ else // the combobox is read-only
+ {
+ // find the right position, or default to the first if not found
+ int pos = Combo()->FindString(m_value);
+ if (pos == wxNOT_FOUND)
+ pos = 0;
+ Combo()->SetSelection(pos);
+ }
}
void wxGridCellChoiceEditor::SetParameters(const wxString& params)
int WXUNUSED(row), int WXUNUSED(col),
bool isSelected)
{
- dc.SetBackgroundMode( wxSOLID );
+ dc.SetBackgroundMode( wxBRUSHSTYLE_SOLID );
- // grey out fields if the grid is disabled
+ wxColour clr;
if ( grid.IsEnabled() )
{
if ( isSelected )
{
- dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) );
+ if ( grid.HasFocus() )
+ clr = grid.GetSelectionBackground();
+ else
+ clr = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW);
}
else
{
- dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) );
+ clr = attr.GetBackgroundColour();
}
}
- else
+ else // grey out fields if the grid is disabled
{
- dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE), wxSOLID));
+ clr = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);
}
+ dc.SetBrush(clr);
dc.SetPen( *wxTRANSPARENT_PEN );
dc.DrawRectangle(rect);
}
wxDC& dc,
bool isSelected)
{
- dc.SetBackgroundMode( wxTRANSPARENT );
+ dc.SetBackgroundMode( wxBRUSHSTYLE_TRANSPARENT );
// TODO some special colours for attr.IsReadOnly() case?
{
if ( isSelected )
{
- dc.SetTextBackground( grid.GetSelectionBackground() );
+ wxColour clr;
+ if ( grid.HasFocus() )
+ clr = grid.GetSelectionBackground();
+ else
+ clr = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW);
+ dc.SetTextBackground( clr );
dc.SetTextForeground( grid.GetSelectionForeground() );
}
else
wxSize size = checkbox->GetBestSize();
wxCoord checkSize = size.y + 2 * wxGRID_CHECKMARK_MARGIN;
- // FIXME wxGTK::wxCheckBox::GetBestSize() gives "wrong" result
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXMOTIF__)
checkSize -= size.y / 2;
#endif
if ( size.x >= minSize || size.y >= minSize )
{
// and even leave (at least) 1 pixel margin
- size.x = size.y = minSize - 2;
+ size.x = size.y = minSize;
}
// draw a border around checkmark
value = wxGridCellBoolEditor::IsTrueValue(cellval);
}
- if ( value )
- {
- wxRect rectMark = rectBorder;
-
-#ifdef __WXMSW__
- // MSW DrawCheckMark() is weird (and should probably be changed...)
- rectMark.Inflate(-wxGRID_CHECKMARK_MARGIN / 2);
- rectMark.x++;
- rectMark.y++;
-#else
- rectMark.Inflate(-wxGRID_CHECKMARK_MARGIN);
-#endif
-
- dc.SetTextForeground(attr.GetTextColour());
- dc.DrawCheckMark(rectMark);
- }
+ int flags = 0;
+ if (value)
+ flags |= wxCONTROL_CHECKED;
- dc.SetBrush(*wxTRANSPARENT_BRUSH);
- dc.SetPen(wxPen(attr.GetTextColour(), 1, wxSOLID));
- dc.DrawRectangle(rectBorder);
+ wxRendererNative::Get().DrawCheckBox( &grid, dc, rectBorder, flags );
}
// ----------------------------------------------------------------------------
// NULL (because the table has a type that the grid does not have in its
// registry), then the grid's default editor or renderer is used.
-wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col) const
+wxGridCellRenderer* wxGridCellAttr::GetRenderer(const wxGrid* grid, int row, int col) const
{
wxGridCellRenderer *renderer = NULL;
}
// same as above, except for s/renderer/editor/g
-wxGridCellEditor* wxGridCellAttr::GetEditor(wxGrid* grid, int row, int col) const
+wxGridCellEditor* wxGridCellAttr::GetEditor(const wxGrid* grid, int row, int col) const
{
wxGridCellEditor *editor = NULL;
void wxGridCellAttrData::SetAttr(wxGridCellAttr *attr, int row, int col)
{
+ // Note: contrary to wxGridRowOrColAttrData::SetAttr, we must not
+ // touch attribute's reference counting explicitly, since this
+ // is managed by class wxGridCellWithAttr
int n = FindIndex(row, col);
if ( n == wxNOT_FOUND )
{
- // add the attribute
- m_attrs.Add(new wxGridCellWithAttr(row, col, attr));
+ if ( attr )
+ {
+ // add the attribute
+ m_attrs.Add(new wxGridCellWithAttr(row, col, attr));
+ }
+ //else: nothing to do
}
- else
+ else // we already have an attribute for this cell
{
- // free the old attribute
- m_attrs[(size_t)n].attr->DecRef();
-
if ( attr )
{
// change the attribute
- m_attrs[(size_t)n].attr = attr;
+ m_attrs[(size_t)n].ChangeAttr(attr);
}
else
{
wxGridCellAttr *wxGridCellAttrData::GetAttr(int row, int col) const
{
- wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
+ wxGridCellAttr *attr = NULL;
int n = FindIndex(row, col);
if ( n != wxNOT_FOUND )
else
{
// ...or remove the attribute
- // No need to DecRef the attribute itself since this is
- // done be wxGridCellWithAttr's destructor!
m_attrs.RemoveAt(n);
n--;
count--;
else
{
// ...or remove the attribute
- // No need to DecRef the attribute itself since this is
- // done be wxGridCellWithAttr's destructor!
m_attrs.RemoveAt(n);
n--;
count--;
wxGridRowOrColAttrData::~wxGridRowOrColAttrData()
{
- size_t count = m_attrs.Count();
+ size_t count = m_attrs.GetCount();
for ( size_t n = 0; n < count; n++ )
{
m_attrs[n]->DecRef();
wxGridCellAttr *wxGridRowOrColAttrData::GetAttr(int rowOrCol) const
{
- wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
+ wxGridCellAttr *attr = NULL;
int n = m_rowsOrCols.Index(rowOrCol);
if ( n != wxNOT_FOUND )
int i = m_rowsOrCols.Index(rowOrCol);
if ( i == wxNOT_FOUND )
{
- // add the attribute
- m_rowsOrCols.Add(rowOrCol);
- m_attrs.Add(attr);
+ if ( attr )
+ {
+ // add the attribute - no need to do anything to reference count
+ // since we take ownership of the attribute.
+ m_rowsOrCols.Add(rowOrCol);
+ m_attrs.Add(attr);
+ }
+ // nothing to remove
}
else
{
size_t n = (size_t)i;
+ if ( m_attrs[n] == attr )
+ // nothing to do
+ return;
if ( attr )
{
- // change the attribute
+ // change the attribute, handling reference count manually,
+ // taking ownership of the new attribute.
m_attrs[n]->DecRef();
m_attrs[n] = attr;
}
else
{
- // remove this attribute
+ // remove this attribute, handling reference count manually
m_attrs[n]->DecRef();
m_rowsOrCols.RemoveAt(n);
m_attrs.RemoveAt(n);
wxGridCellAttrProvider::wxGridCellAttrProvider()
{
- m_data = (wxGridCellAttrProviderData *)NULL;
+ m_data = NULL;
}
wxGridCellAttrProvider::~wxGridCellAttrProvider()
wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col,
wxGridCellAttr::wxAttrKind kind ) const
{
- wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
+ wxGridCellAttr *attr = NULL;
if ( m_data )
{
switch (kind)
wxGridTypeRegistry::~wxGridTypeRegistry()
{
- size_t count = m_typeinfo.Count();
+ size_t count = m_typeinfo.GetCount();
for ( size_t i = 0; i < count; i++ )
delete m_typeinfo[i];
}
wxGridTableBase::wxGridTableBase()
{
- m_view = (wxGrid *) NULL;
- m_attrProvider = (wxGridCellAttrProvider *) NULL;
+ m_view = NULL;
+ m_attrProvider = NULL;
}
wxGridTableBase::~wxGridTableBase()
if ( m_attrProvider )
return m_attrProvider->GetAttr(row, col, kind);
else
- return (wxGridCellAttr *)NULL;
+ return NULL;
}
void wxGridTableBase::SetAttr(wxGridCellAttr* attr, int row, int col)
{
if ( m_attrProvider )
{
- attr->SetKind(wxGridCellAttr::Cell);
+ if ( attr )
+ attr->SetKind(wxGridCellAttr::Cell);
m_attrProvider->SetAttr(attr, row, col);
}
else
wxGridTableMessage::wxGridTableMessage()
{
- m_table = (wxGridTableBase *) NULL;
+ m_table = NULL;
m_id = -1;
m_comInt1 = -1;
m_comInt2 = -1;
m_data[row][col] = value;
}
-bool wxGridStringTable::IsEmptyCell( int row, int col )
-{
- wxCHECK_MSG( (row < GetNumberRows()) && (col < GetNumberCols()),
- true,
- _T("invalid row or column index in wxGridStringTable") );
-
- return (m_data[row][col] == wxEmptyString);
-}
-
void wxGridStringTable::Clear()
{
int row, col;
size_t curNumRows = m_data.GetCount();
-#if 0
- if ( !curNumRows )
- {
- // TODO: something better than this ?
- //
- wxFAIL_MSG( wxT("Unable to append cols to a grid table with no rows.\nCall AppendRows() first") );
- return false;
- }
-#endif
-
for ( row = 0; row < curNumRows; row++ )
{
m_data[row].Add( wxEmptyString, numCols );
if ( !m_colLabels.IsEmpty() )
{
- m_colLabels.RemoveAt( colID, numCols );
+ // m_colLabels stores just as many elements as it needs, e.g. if only
+ // the label of the first column had been set it would have only one
+ // element and not numCols, so account for it
+ int nToRm = m_colLabels.size() - colID;
+ if ( nToRm > 0 )
+ m_colLabels.RemoveAt( colID, nToRm );
}
for ( row = 0; row < curNumRows; row++ )
//////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////
-IMPLEMENT_DYNAMIC_CLASS( wxGridRowLabelWindow, wxWindow )
+BEGIN_EVENT_TABLE(wxGridSubwindow, wxWindow)
+ EVT_MOUSE_CAPTURE_LOST(wxGridSubwindow::OnMouseCaptureLost)
+END_EVENT_TABLE()
+
+void wxGridSubwindow::OnMouseCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event))
+{
+ m_owner->CancelMouseCapture();
+}
-BEGIN_EVENT_TABLE( wxGridRowLabelWindow, wxWindow )
+BEGIN_EVENT_TABLE( wxGridRowLabelWindow, wxGridSubwindow )
EVT_PAINT( wxGridRowLabelWindow::OnPaint )
EVT_MOUSEWHEEL( wxGridRowLabelWindow::OnMouseWheel )
EVT_MOUSE_EVENTS( wxGridRowLabelWindow::OnMouseEvent )
- EVT_KEY_DOWN( wxGridRowLabelWindow::OnKeyDown )
- EVT_KEY_UP( wxGridRowLabelWindow::OnKeyUp )
- EVT_CHAR( wxGridRowLabelWindow::OnChar )
END_EVENT_TABLE()
-wxGridRowLabelWindow::wxGridRowLabelWindow( wxGrid *parent,
- wxWindowID id,
- const wxPoint &pos, const wxSize &size )
- : wxWindow( parent, id, pos, size, wxWANTS_CHARS | wxBORDER_NONE | wxFULL_REPAINT_ON_RESIZE )
-{
- m_owner = parent;
-}
-
void wxGridRowLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
{
wxPaintDC dc(this);
void wxGridRowLabelWindow::OnMouseWheel( wxMouseEvent& event )
{
- m_owner->GetEventHandler()->ProcessEvent( event );
-}
-
-// This seems to be required for wxMotif otherwise the mouse
-// cursor must be in the cell edit control to get key events
-//
-void wxGridRowLabelWindow::OnKeyDown( wxKeyEvent& event )
-{
- if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
- event.Skip();
-}
-
-void wxGridRowLabelWindow::OnKeyUp( wxKeyEvent& event )
-{
- if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
- event.Skip();
-}
-
-void wxGridRowLabelWindow::OnChar( wxKeyEvent& event )
-{
- if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+ if (!m_owner->GetEventHandler()->ProcessEvent( event ))
event.Skip();
}
//////////////////////////////////////////////////////////////////////
-IMPLEMENT_DYNAMIC_CLASS( wxGridColLabelWindow, wxWindow )
-
-BEGIN_EVENT_TABLE( wxGridColLabelWindow, wxWindow )
+BEGIN_EVENT_TABLE( wxGridColLabelWindow, wxGridSubwindow )
EVT_PAINT( wxGridColLabelWindow::OnPaint )
EVT_MOUSEWHEEL( wxGridColLabelWindow::OnMouseWheel )
EVT_MOUSE_EVENTS( wxGridColLabelWindow::OnMouseEvent )
- EVT_KEY_DOWN( wxGridColLabelWindow::OnKeyDown )
- EVT_KEY_UP( wxGridColLabelWindow::OnKeyUp )
- EVT_CHAR( wxGridColLabelWindow::OnChar )
END_EVENT_TABLE()
-wxGridColLabelWindow::wxGridColLabelWindow( wxGrid *parent,
- wxWindowID id,
- const wxPoint &pos, const wxSize &size )
- : wxWindow( parent, id, pos, size, wxWANTS_CHARS | wxBORDER_NONE | wxFULL_REPAINT_ON_RESIZE )
-{
- m_owner = parent;
-}
-
void wxGridColLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
{
wxPaintDC dc(this);
void wxGridColLabelWindow::OnMouseWheel( wxMouseEvent& event )
{
- m_owner->GetEventHandler()->ProcessEvent( event );
-}
-
-// This seems to be required for wxMotif otherwise the mouse
-// cursor must be in the cell edit control to get key events
-//
-void wxGridColLabelWindow::OnKeyDown( wxKeyEvent& event )
-{
- if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
- event.Skip();
-}
-
-void wxGridColLabelWindow::OnKeyUp( wxKeyEvent& event )
-{
- if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
- event.Skip();
-}
-
-void wxGridColLabelWindow::OnChar( wxKeyEvent& event )
-{
- if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+ if (!m_owner->GetEventHandler()->ProcessEvent( event ))
event.Skip();
}
//////////////////////////////////////////////////////////////////////
-IMPLEMENT_DYNAMIC_CLASS( wxGridCornerLabelWindow, wxWindow )
-
-BEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxWindow )
+BEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxGridSubwindow )
EVT_MOUSEWHEEL( wxGridCornerLabelWindow::OnMouseWheel )
EVT_MOUSE_EVENTS( wxGridCornerLabelWindow::OnMouseEvent )
EVT_PAINT( wxGridCornerLabelWindow::OnPaint )
- EVT_KEY_DOWN( wxGridCornerLabelWindow::OnKeyDown )
- EVT_KEY_UP( wxGridCornerLabelWindow::OnKeyUp )
- EVT_CHAR( wxGridCornerLabelWindow::OnChar )
END_EVENT_TABLE()
-wxGridCornerLabelWindow::wxGridCornerLabelWindow( wxGrid *parent,
- wxWindowID id,
- const wxPoint &pos, const wxSize &size )
- : wxWindow( parent, id, pos, size, wxWANTS_CHARS | wxBORDER_NONE | wxFULL_REPAINT_ON_RESIZE )
-{
- m_owner = parent;
-}
-
void wxGridCornerLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
{
wxPaintDC dc(this);
- int client_height = 0;
- int client_width = 0;
- GetClientSize( &client_width, &client_height );
-
- // VZ: any reason for this ifdef? (FIXME)
-#if 0
-def __WXGTK__
- wxRect rect;
- rect.SetX( 1 );
- rect.SetY( 1 );
- rect.SetWidth( client_width - 2 );
- rect.SetHeight( client_height - 2 );
-
- wxRendererNative::Get().DrawHeaderButton( this, dc, rect, 0 );
-#else // !__WXGTK__
- dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW), 1, wxSOLID) );
- dc.DrawLine( client_width - 1, client_height - 1, client_width - 1, 0 );
- dc.DrawLine( client_width - 1, client_height - 1, 0, client_height - 1 );
- dc.DrawLine( 0, 0, client_width, 0 );
- dc.DrawLine( 0, 0, 0, client_height );
-
- dc.SetPen( *wxWHITE_PEN );
- dc.DrawLine( 1, 1, client_width - 1, 1 );
- dc.DrawLine( 1, 1, 1, client_height - 1 );
-#endif
+ m_owner->DrawCornerLabel(dc);
}
void wxGridCornerLabelWindow::OnMouseEvent( wxMouseEvent& event )
void wxGridCornerLabelWindow::OnMouseWheel( wxMouseEvent& event )
{
- m_owner->GetEventHandler()->ProcessEvent(event);
-}
-
-// This seems to be required for wxMotif otherwise the mouse
-// cursor must be in the cell edit control to get key events
-//
-void wxGridCornerLabelWindow::OnKeyDown( wxKeyEvent& event )
-{
- if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
- event.Skip();
-}
-
-void wxGridCornerLabelWindow::OnKeyUp( wxKeyEvent& event )
-{
- if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
- event.Skip();
-}
-
-void wxGridCornerLabelWindow::OnChar( wxKeyEvent& event )
-{
- if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
+ if (!m_owner->GetEventHandler()->ProcessEvent(event))
event.Skip();
}
//////////////////////////////////////////////////////////////////////
-IMPLEMENT_DYNAMIC_CLASS( wxGridWindow, wxWindow )
-
-BEGIN_EVENT_TABLE( wxGridWindow, wxWindow )
+BEGIN_EVENT_TABLE( wxGridWindow, wxGridSubwindow )
EVT_PAINT( wxGridWindow::OnPaint )
EVT_MOUSEWHEEL( wxGridWindow::OnMouseWheel )
EVT_MOUSE_EVENTS( wxGridWindow::OnMouseEvent )
EVT_ERASE_BACKGROUND( wxGridWindow::OnEraseBackground )
END_EVENT_TABLE()
-wxGridWindow::wxGridWindow( wxGrid *parent,
- wxGridRowLabelWindow *rowLblWin,
- wxGridColLabelWindow *colLblWin,
- wxWindowID id,
- const wxPoint &pos,
- const wxSize &size )
- : wxWindow(
- parent, id, pos, size,
- wxWANTS_CHARS | wxBORDER_NONE | wxCLIP_CHILDREN | wxFULL_REPAINT_ON_RESIZE,
- wxT("grid window") )
-{
- m_owner = parent;
- m_rowLabelWin = rowLblWin;
- m_colLabelWin = colLblWin;
-}
-
void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
{
wxPaintDC dc( this );
wxGridCellCoordsArray dirtyCells = m_owner->CalcCellsExposed( reg );
m_owner->DrawGridCellArea( dc, dirtyCells );
-#if WXGRID_DRAW_LINES
+ m_owner->DrawGridSpace( dc );
+
m_owner->DrawAllGridLines( dc, reg );
-#endif
- m_owner->DrawGridSpace( dc );
m_owner->DrawHighlight( dc, dirtyCells );
}
void wxGridWindow::ScrollWindow( int dx, int dy, const wxRect *rect )
{
wxWindow::ScrollWindow( dx, dy, rect );
- m_rowLabelWin->ScrollWindow( 0, dy, rect );
- m_colLabelWin->ScrollWindow( dx, 0, rect );
+ m_owner->GetGridRowLabelWindow()->ScrollWindow( 0, dy, rect );
+ m_owner->GetGridColLabelWindow()->ScrollWindow( dx, 0, rect );
}
void wxGridWindow::OnMouseEvent( wxMouseEvent& event )
void wxGridWindow::OnMouseWheel( wxMouseEvent& event )
{
- m_owner->GetEventHandler()->ProcessEvent( event );
+ if (!m_owner->GetEventHandler()->ProcessEvent( event ))
+ event.Skip();
}
// This seems to be required for wxMotif/wxGTK otherwise the mouse
void wxGridWindow::OnFocus(wxFocusEvent& event)
{
+ // and if we have any selection, it has to be repainted, because it
+ // uses different colour when the grid is not focused:
+ if ( m_owner->IsSelection() )
+ {
+ Refresh();
+ }
+ else
+ {
+ // NB: Note that this code is in "else" branch only because the other
+ // branch refreshes everything and so there's no point in calling
+ // Refresh() again, *not* because it should only be done if
+ // !IsSelection(). If the above code is ever optimized to refresh
+ // only selected area, this needs to be moved out of the "else"
+ // branch so that it's always executed.
+
+ // current cell cursor {dis,re}appears on focus change:
+ const wxGridCellCoords cursorCoords(m_owner->GetGridCursorRow(),
+ m_owner->GetGridCursorCol());
+ const wxRect cursor =
+ m_owner->BlockToDeviceRect(cursorCoords, cursorCoords);
+ Refresh(true, &cursor);
+ }
+
if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
event.Skip();
}
-//////////////////////////////////////////////////////////////////////
-
-// Internal Helper function for computing row or column from some
-// (unscrolled) coordinate value, using either
-// m_defaultRowHeight/m_defaultColWidth or binary search on array
-// of m_rowBottoms/m_ColRights to speed up the search!
-
-// Internal helper macros for simpler use of that function
-
-static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
- const wxArrayInt& BorderArray, int nMax,
- bool clipToMinMax);
-
#define internalXToCol(x) XToCol(x, true)
-#define internalYToRow(y) CoordToRowOrCol(y, m_defaultRowHeight, \
- m_minAcceptableRowHeight, \
- m_rowBottoms, m_numRows, true)
+#define internalYToRow(y) YToRow(y, true)
/////////////////////////////////////////////////////////////////////
EVT_ERASE_BACKGROUND( wxGrid::OnEraseBackground )
END_EVENT_TABLE()
-wxGrid::wxGrid()
-{
- // in order to make sure that a size event is not
- // trigerred in a unfinished state
- m_cornerLabelWin = NULL;
- m_rowLabelWin = NULL;
- m_colLabelWin = NULL;
- m_gridWin = NULL;
-}
-
-wxGrid::wxGrid( wxWindow *parent,
- wxWindowID id,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxString& name )
- : wxScrolledWindow( parent, id, pos, size, (style | wxWANTS_CHARS), name ),
- m_colMinWidths(GRID_HASH_SIZE),
- m_rowMinHeights(GRID_HASH_SIZE)
-{
- Create();
- SetInitialSize(size);
-}
-
bool wxGrid::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size,
long style, const wxString& name)
Create();
SetInitialSize(size);
+ SetScrollRate(m_scrollLineX, m_scrollLineY);
+ CalcDimensions();
return true;
}
wxGrid::~wxGrid()
{
+ if ( m_winCapture )
+ m_winCapture->ReleaseMouse();
+
+ // Ensure that the editor control is destroyed before the grid is,
+ // otherwise we crash later when the editor tries to do something with the
+ // half destroyed grid
+ HideCellEditControl();
+
// Must do this or ~wxScrollHelper will pop the wrong event handler
SetTargetWindow(this);
ClearAttrCache();
void wxGrid::Create()
{
- // set to true by CreateGrid
- m_created = false;
-
// create the type registry
m_typeRegistry = new wxGridTypeRegistry;
- m_selection = NULL;
-
- m_table = (wxGridTableBase *) NULL;
- m_ownTable = false;
m_cellEditCtrlEnabled = false;
m_numCols = 0;
m_currentCellCoords = wxGridNoCellCoords;
- m_rowLabelWidth = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
- m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
-
// subwindow components that make up the wxGrid
- m_rowLabelWin = new wxGridRowLabelWindow( this,
- wxID_ANY,
- wxDefaultPosition,
- wxDefaultSize );
-
- m_colLabelWin = new wxGridColLabelWindow( this,
- wxID_ANY,
- wxDefaultPosition,
- wxDefaultSize );
-
- m_cornerLabelWin = new wxGridCornerLabelWindow( this,
- wxID_ANY,
- wxDefaultPosition,
- wxDefaultSize );
-
- m_gridWin = new wxGridWindow( this,
- m_rowLabelWin,
- m_colLabelWin,
- wxID_ANY,
- wxDefaultPosition,
- wxDefaultSize );
+ m_rowLabelWin = new wxGridRowLabelWindow(this);
+ CreateColumnWindow();
+ m_cornerLabelWin = new wxGridCornerLabelWindow(this);
+ m_gridWin = new wxGridWindow( this );
SetTargetWindow( m_gridWin );
m_cornerLabelWin->SetOwnBackgroundColour(lbg);
m_rowLabelWin->SetOwnForegroundColour(lfg);
m_rowLabelWin->SetOwnBackgroundColour(lbg);
- m_colLabelWin->SetOwnForegroundColour(lfg);
- m_colLabelWin->SetOwnBackgroundColour(lbg);
+ m_colWindow->SetOwnForegroundColour(lfg);
+ m_colWindow->SetOwnBackgroundColour(lbg);
m_gridWin->SetOwnForegroundColour(gfg);
m_gridWin->SetOwnBackgroundColour(gbg);
- Init();
+ m_labelBackgroundColour = m_rowLabelWin->GetBackgroundColour();
+ m_labelTextColour = m_rowLabelWin->GetForegroundColour();
+
+ // now that we have the grid window, use its font to compute the default
+ // row height
+ m_defaultRowHeight = m_gridWin->GetCharHeight();
+#if defined(__WXMOTIF__) || defined(__WXGTK__) // see also text ctrl sizing in ShowCellEditControl()
+ m_defaultRowHeight += 8;
+#else
+ m_defaultRowHeight += 4;
+#endif
+
}
-bool wxGrid::CreateGrid( int numRows, int numCols,
- wxGrid::wxGridSelectionModes selmode )
+void wxGrid::CreateColumnWindow()
{
- wxCHECK_MSG( !m_created,
+ if ( m_useNativeHeader )
+ {
+ m_colWindow = new wxGridHeaderCtrl(this);
+ m_colLabelHeight = m_colWindow->GetBestSize().y;
+ }
+ else // draw labels ourselves
+ {
+ m_colWindow = new wxGridColLabelWindow(this);
+ m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
+ }
+}
+
+bool wxGrid::CreateGrid( int numRows, int numCols,
+ wxGridSelectionModes selmode )
+{
+ wxCHECK_MSG( !m_created,
false,
wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") );
- m_numRows = numRows;
- m_numCols = numCols;
-
- m_table = new wxGridStringTable( m_numRows, m_numCols );
- m_table->SetView( this );
- m_ownTable = true;
- m_selection = new wxGridSelection( this, selmode );
-
- CalcDimensions();
-
- m_created = true;
-
- return m_created;
+ return SetTable(new wxGridStringTable(numRows, numCols), true, selmode);
}
-void wxGrid::SetSelectionMode(wxGrid::wxGridSelectionModes selmode)
+void wxGrid::SetSelectionMode(wxGridSelectionModes selmode)
{
wxCHECK_RET( m_created,
wxT("Called wxGrid::SetSelectionMode() before calling CreateGrid()") );
wxGrid::wxGridSelectionModes wxGrid::GetSelectionMode() const
{
- wxCHECK_MSG( m_created, wxGrid::wxGridSelectCells,
+ wxCHECK_MSG( m_created, wxGridSelectCells,
wxT("Called wxGrid::GetSelectionMode() before calling CreateGrid()") );
return m_selection->GetSelectionMode();
}
-bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership,
- wxGrid::wxGridSelectionModes selmode )
+bool
+wxGrid::SetTable(wxGridTableBase *table,
+ bool takeOwnership,
+ wxGrid::wxGridSelectionModes selmode )
{
+ bool checkSelection = false;
if ( m_created )
{
// stop all processing
m_created = false;
- if (m_ownTable)
+ if (m_table)
{
- wxGridTableBase *t = m_table;
+ m_table->SetView(0);
+ if( m_ownTable )
+ delete m_table;
m_table = NULL;
- delete t;
}
delete m_selection;
-
- m_table = NULL;
m_selection = NULL;
+
+ m_ownTable = false;
m_numRows = 0;
m_numCols = 0;
+ checkSelection = true;
+
+ // kill row and column size arrays
+ m_colWidths.Empty();
+ m_colRights.Empty();
+ m_rowHeights.Empty();
+ m_rowBottoms.Empty();
}
if (table)
m_numRows = table->GetNumberRows();
m_numCols = table->GetNumberCols();
+ if ( m_useNativeHeader )
+ GetGridColHeader()->SetColumnCount(m_numCols);
+
m_table = table;
m_table->SetView( this );
m_ownTable = takeOwnership;
m_selection = new wxGridSelection( this, selmode );
-
+ if (checkSelection)
+ {
+ // If the newly set table is smaller than the
+ // original one current cell and selection regions
+ // might be invalid,
+ m_selectedBlockCorner = wxGridNoCellCoords;
+ m_currentCellCoords =
+ wxGridCellCoords(wxMin(m_numRows, m_currentCellCoords.GetRow()),
+ wxMin(m_numCols, m_currentCellCoords.GetCol()));
+ if (m_selectedBlockTopLeft.GetRow() >= m_numRows ||
+ m_selectedBlockTopLeft.GetCol() >= m_numCols)
+ {
+ m_selectedBlockTopLeft = wxGridNoCellCoords;
+ m_selectedBlockBottomRight = wxGridNoCellCoords;
+ }
+ else
+ m_selectedBlockBottomRight =
+ wxGridCellCoords(wxMin(m_numRows,
+ m_selectedBlockBottomRight.GetRow()),
+ wxMin(m_numCols,
+ m_selectedBlockBottomRight.GetCol()));
+ }
CalcDimensions();
m_created = true;
void wxGrid::Init()
{
- m_rowLabelWidth = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
- m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
+ m_created = false;
- if ( m_rowLabelWin )
- {
- m_labelBackgroundColour = m_rowLabelWin->GetBackgroundColour();
- }
- else
- {
- m_labelBackgroundColour = *wxWHITE;
- }
+ m_cornerLabelWin = NULL;
+ m_rowLabelWin = NULL;
+ m_colWindow = NULL;
+ m_gridWin = NULL;
- m_labelTextColour = *wxBLACK;
+ m_table = NULL;
+ m_ownTable = false;
+
+ m_selection = NULL;
+ m_defaultCellAttr = NULL;
+ m_typeRegistry = NULL;
+ m_winCapture = NULL;
+
+ m_rowLabelWidth = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
+ m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
// init attr cache
m_attrCache.row = -1;
m_attrCache.col = -1;
m_attrCache.attr = NULL;
- // TODO: something better than this ?
- //
- m_labelFont = this->GetFont();
+ m_labelFont = GetFont();
m_labelFont.SetWeight( wxBOLD );
m_rowLabelHorizAlign = wxALIGN_CENTRE;
m_colLabelTextOrientation = wxHORIZONTAL;
m_defaultColWidth = WXGRID_DEFAULT_COL_WIDTH;
- m_defaultRowHeight = m_gridWin->GetCharHeight();
+ m_defaultRowHeight = 0; // this will be initialized after creation
m_minAcceptableColWidth = WXGRID_MIN_COL_WIDTH;
m_minAcceptableRowHeight = WXGRID_MIN_ROW_HEIGHT;
-#if defined(__WXMOTIF__) || defined(__WXGTK__) // see also text ctrl sizing in ShowCellEditControl()
- m_defaultRowHeight += 8;
-#else
- m_defaultRowHeight += 4;
-#endif
-
m_gridLineColour = wxColour( 192,192,192 );
m_gridLinesEnabled = true;
+ m_gridLinesClipHorz =
+ m_gridLinesClipVert = true;
m_cellHighlightColour = *wxBLACK;
m_cellHighlightPenWidth = 2;
m_cellHighlightROPenWidth = 1;
m_canDragColMove = false;
m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
- m_winCapture = (wxWindow *)NULL;
+ m_winCapture = NULL;
m_canDragRowSize = true;
m_canDragColSize = true;
m_canDragGridSize = true;
m_isDragging = false;
m_startDragPos = wxDefaultPosition;
+ m_sortCol = wxNOT_FOUND;
+ m_sortIsAscending = true;
+
+ m_useNativeHeader =
+ m_nativeColumnLabels = false;
+
m_waitForSlowClick = false;
m_rowResizeCursor = wxCursor( wxCURSOR_SIZENS );
m_currentCellCoords = wxGridNoCellCoords;
- ClearSelection();
+ m_selectedBlockTopLeft =
+ m_selectedBlockBottomRight =
+ m_selectedBlockCorner = wxGridNoCellCoords;
m_selectionBackground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
m_selectionForeground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
m_colWidths.Add( m_defaultColWidth, m_numCols );
- int colRight = 0;
for ( int i = 0; i < m_numCols; i++ )
{
- colRight = ( GetColPos( i ) + 1 ) * m_defaultColWidth;
+ int colRight = ( GetColPos( i ) + 1 ) * m_defaultColWidth;
m_colRights.Add( colRight );
}
}
if ( y >= h )
y = wxMax( h - 1, 0 );
- // do set scrollbar parameters
- SetScrollbars( m_scrollLineX, m_scrollLineY,
- GetScrollX(w), GetScrollY(h),
- x, y,
- GetBatchCount() != 0);
+ // update the virtual size and refresh the scrollbars to reflect it
+ m_gridWin->SetVirtualSize(w, h);
+ Scroll(x, y);
+ AdjustScrollbars();
// if our OnSize() hadn't been called (it would if we have scrollbars), we
// still must reposition the children
CalcWindowSizes();
}
+wxSize wxGrid::GetSizeAvailableForScrollTarget(const wxSize& size)
+{
+ wxSize sizeGridWin(size);
+ sizeGridWin.x -= m_rowLabelWidth;
+ sizeGridWin.y -= m_colLabelHeight;
+
+ return sizeGridWin;
+}
+
void wxGrid::CalcWindowSizes()
{
// escape if the window is has not been fully created yet
int cw, ch;
GetClientSize( &cw, &ch );
- // this block of code tries to work around the following problem: the grid
- // could have been just resized to have enough space to show the full grid
- // window contents without the scrollbars, but its client size could be
- // not big enough because the grid has the scrollbars right now and so the
- // scrollbars would remain even though we don't need them any more
- //
- // to prevent this from happening, check if we have enough space for
- // everything without the scrollbars and explicitly disable them then
- wxSize size = GetSize() - GetWindowBorderSize();
- if ( size != wxSize(cw, ch) )
- {
- // check if we have enough space for grid window after accounting for
- // the fixed size elements
- size.x -= m_rowLabelWidth;
- size.y -= m_colLabelHeight;
-
- const wxSize vsize = m_gridWin->GetVirtualSize();
-
- if ( size.x >= vsize.x && size.y >= vsize.y )
- {
- // yes, we do, so remove the scrollbars and use the new client size
- // (which should be the same as full window size - borders now)
- SetScrollbars(0, 0, 0, 0);
- GetClientSize(&cw, &ch);
- }
- }
+ // the grid may be too small to have enough space for the labels yet, don't
+ // size the windows to negative sizes in this case
+ int gw = cw - m_rowLabelWidth;
+ int gh = ch - m_colLabelHeight;
+ if (gw < 0)
+ gw = 0;
+ if (gh < 0)
+ gh = 0;
if ( m_cornerLabelWin && m_cornerLabelWin->IsShown() )
m_cornerLabelWin->SetSize( 0, 0, m_rowLabelWidth, m_colLabelHeight );
- if ( m_colLabelWin && m_colLabelWin->IsShown() )
- m_colLabelWin->SetSize( m_rowLabelWidth, 0, cw - m_rowLabelWidth, m_colLabelHeight );
+ if ( m_colWindow && m_colWindow->IsShown() )
+ m_colWindow->SetSize( m_rowLabelWidth, 0, gw, m_colLabelHeight );
if ( m_rowLabelWin && m_rowLabelWin->IsShown() )
- m_rowLabelWin->SetSize( 0, m_colLabelHeight, m_rowLabelWidth, ch - m_colLabelHeight );
+ m_rowLabelWin->SetSize( 0, m_colLabelHeight, m_rowLabelWidth, gh );
if ( m_gridWin && m_gridWin->IsShown() )
- m_gridWin->SetSize( m_rowLabelWidth, m_colLabelHeight, cw - m_rowLabelWidth, ch - m_colLabelHeight );
+ m_gridWin->SetSize( m_rowLabelWidth, m_colLabelHeight, gw, gh );
}
// this is called when the grid table sends a message
// cell it might want to save that stuff to might no longer exist.
HideCellEditControl();
-#if 0
- // if we were using the default widths/heights so far, we must change them
- // now
- if ( m_colWidths.IsEmpty() )
- {
- InitColWidths();
- }
-
- if ( m_rowHeights.IsEmpty() )
- {
- InitRowHeights();
- }
-#endif
-
switch ( msg.GetId() )
{
case wxGRIDTABLE_NOTIFY_ROWS_INSERTED:
int numCols = msg.GetCommandInt2();
m_numCols += numCols;
+ if ( m_useNativeHeader )
+ GetGridColHeader()->SetColumnCount(m_numCols);
+
if ( !m_colAt.IsEmpty() )
{
//Shift the column IDs
if ( !GetBatchCount() )
{
CalcDimensions();
- m_colLabelWin->Refresh();
+ m_colWindow->Refresh();
}
}
result = true;
int numCols = msg.GetCommandInt();
int oldNumCols = m_numCols;
m_numCols += numCols;
+ if ( m_useNativeHeader )
+ GetGridColHeader()->SetColumnCount(m_numCols);
if ( !m_colAt.IsEmpty() )
{
if ( !GetBatchCount() )
{
CalcDimensions();
- m_colLabelWin->Refresh();
+ m_colWindow->Refresh();
}
}
result = true;
size_t pos = msg.GetCommandInt();
int numCols = msg.GetCommandInt2();
m_numCols -= numCols;
+ if ( m_useNativeHeader )
+ GetGridColHeader()->SetColumnCount(m_numCols);
if ( !m_colAt.IsEmpty() )
{
if ( !GetBatchCount() )
{
CalcDimensions();
- m_colLabelWin->Refresh();
+ m_colWindow->Refresh();
}
}
result = true;
return result;
}
-wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg )
+wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg ) const
{
wxRegionIterator iter( reg );
wxRect r;
return rowlabels;
}
-wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg )
+wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg ) const
{
wxRegionIterator iter( reg );
wxRect r;
return colLabels;
}
-wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg )
+wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg ) const
{
wxRegionIterator iter( reg );
wxRect r;
CalcUnscrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom );
// find the cells within these bounds
- //
- int row, col;
- for ( row = internalYToRow(top); row < m_numRows; row++ )
+ wxArrayInt cols;
+ for ( int row = internalYToRow(top); row < m_numRows; row++ )
{
if ( GetRowBottom(row) <= top )
continue;
if ( GetRowTop(row) > bottom )
break;
- int colPos;
- for ( colPos = GetColPos( internalXToCol(left) ); colPos < m_numCols; colPos++ )
+ // add all dirty cells in this row: notice that the columns which
+ // are dirty don't depend on the row so we compute them only once
+ // for the first dirty row and then reuse for all the next ones
+ if ( cols.empty() )
{
- col = GetColAt( colPos );
+ // do determine the dirty columns
+ for ( int pos = XToPos(left); pos <= XToPos(right); pos++ )
+ cols.push_back(GetColAt(pos));
- if ( GetColRight(col) <= left )
- continue;
-
- if ( GetColLeft(col) > right )
+ // if there are no dirty columns at all, nothing to do
+ if ( cols.empty() )
break;
-
- cellsExposed.Add( wxGridCellCoords( row, col ) );
}
+
+ const size_t count = cols.size();
+ for ( size_t n = 0; n < count; n++ )
+ cellsExposed.Add(wxGridCellCoords(row, cols[n]));
}
++iter;
if ( (row = YToRow( y )) >= 0 )
{
if ( m_selection )
- {
- m_selection->SelectRow( row,
- event.ControlDown(),
- event.ShiftDown(),
- event.AltDown(),
- event.MetaDown() );
- }
+ m_selection->SelectRow(row, event);
}
}
break;
{
if ( event.ShiftDown() )
{
- m_selection->SelectBlock( m_currentCellCoords.GetRow(),
- 0,
- row,
- GetNumberCols() - 1,
- event.ControlDown(),
- event.ShiftDown(),
- event.AltDown(),
- event.MetaDown() );
+ m_selection->SelectBlock
+ (
+ m_currentCellCoords.GetRow(), 0,
+ row, GetNumberCols() - 1,
+ event
+ );
}
else
{
- m_selection->SelectRow( row,
- event.ControlDown(),
- event.ShiftDown(),
- event.AltDown(),
- event.MetaDown() );
+ m_selection->SelectRow(row, event);
}
}
// adjust row height depending on label text
AutoSizeRowLabelSize( row );
- ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);
+ ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, GetColLabelWindow());
m_dragLastPos = -1;
}
}
}
}
+void wxGrid::UpdateColumnSortingIndicator(int col)
+{
+ wxCHECK_RET( col != wxNOT_FOUND, "invalid column index" );
+
+ if ( m_useNativeHeader )
+ GetGridColHeader()->UpdateColumn(col);
+ else if ( m_nativeColumnLabels )
+ m_colWindow->Refresh();
+ //else: sorting indicator display not yet implemented in grid version
+}
+
+void wxGrid::SetSortingColumn(int col, bool ascending)
+{
+ if ( col == m_sortCol )
+ {
+ // we are already using this column for sorting (or not sorting at all)
+ // but we might still change the sorting order, check for it
+ if ( m_sortCol != wxNOT_FOUND && ascending != m_sortIsAscending )
+ {
+ m_sortIsAscending = ascending;
+
+ UpdateColumnSortingIndicator(m_sortCol);
+ }
+ }
+ else // we're changing the column used for sorting
+ {
+ const int sortColOld = m_sortCol;
+
+ // change it before updating the column as we want GetSortingColumn()
+ // to return the correct new value
+ m_sortCol = col;
+
+ if ( sortColOld != wxNOT_FOUND )
+ UpdateColumnSortingIndicator(sortColOld);
+
+ if ( m_sortCol != wxNOT_FOUND )
+ {
+ m_sortIsAscending = ascending;
+ UpdateColumnSortingIndicator(m_sortCol);
+ }
+ }
+}
+
+void wxGrid::DoColHeaderClick(int col)
+{
+ // we consider that the grid was resorted if this event is processed and
+ // not vetoed
+ if ( SendEvent(wxEVT_GRID_COL_SORT, -1, col) == 1 )
+ {
+ SetSortingColumn(col, IsSortingBy(col) ? !m_sortIsAscending : true);
+ Refresh();
+ }
+}
+
+void wxGrid::DoStartResizeCol(int col)
+{
+ m_dragRowOrCol = col;
+ m_dragLastPos = -1;
+ DoUpdateResizeColWidth(GetColWidth(m_dragRowOrCol));
+}
+
+void wxGrid::DoUpdateResizeCol(int x)
+{
+ int cw, ch, dummy, top;
+ m_gridWin->GetClientSize( &cw, &ch );
+ CalcUnscrolledPosition( 0, 0, &dummy, &top );
+
+ wxClientDC dc( m_gridWin );
+ PrepareDC( dc );
+
+ x = wxMax( x, GetColLeft(m_dragRowOrCol) + GetColMinimalWidth(m_dragRowOrCol));
+ dc.SetLogicalFunction(wxINVERT);
+ if ( m_dragLastPos >= 0 )
+ {
+ dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top + ch );
+ }
+ dc.DrawLine( x, top, x, top + ch );
+ m_dragLastPos = x;
+}
+
+void wxGrid::DoUpdateResizeColWidth(int w)
+{
+ DoUpdateResizeCol(GetColLeft(m_dragRowOrCol) + w);
+}
+
void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
{
- int x, y, col;
+ int x, y;
wxPoint pos( event.GetPosition() );
CalcUnscrolledPosition( pos.x, pos.y, &x, &y );
+ int col = XToCol(x);
if ( event.Dragging() )
{
if (!m_isDragging)
{
m_isDragging = true;
- m_colLabelWin->CaptureMouse();
+ GetColLabelWindow()->CaptureMouse();
- if ( m_cursorMode == WXGRID_CURSOR_MOVE_COL )
- m_dragRowOrCol = XToCol( x );
+ if ( m_cursorMode == WXGRID_CURSOR_MOVE_COL && col != -1 )
+ DoStartMoveCol(col);
}
if ( event.LeftIsDown() )
switch ( m_cursorMode )
{
case WXGRID_CURSOR_RESIZE_COL:
- {
- int cw, ch, dummy, top;
- m_gridWin->GetClientSize( &cw, &ch );
- CalcUnscrolledPosition( 0, 0, &dummy, &top );
-
- wxClientDC dc( m_gridWin );
- PrepareDC( dc );
-
- x = wxMax( x, GetColLeft(m_dragRowOrCol) +
- GetColMinimalWidth(m_dragRowOrCol));
- dc.SetLogicalFunction(wxINVERT);
- if ( m_dragLastPos >= 0 )
- {
- dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top + ch );
- }
- dc.DrawLine( x, top, x, top + ch );
- m_dragLastPos = x;
- }
+ DoUpdateResizeCol(x);
break;
case WXGRID_CURSOR_SELECT_COL:
{
- if ( (col = XToCol( x )) >= 0 )
+ if ( col != -1 )
{
if ( m_selection )
- {
- m_selection->SelectCol( col,
- event.ControlDown(),
- event.ShiftDown(),
- event.AltDown(),
- event.MetaDown() );
- }
+ m_selection->SelectCol(col, event);
}
}
break;
case WXGRID_CURSOR_MOVE_COL:
{
- if ( x < 0 )
- m_moveToCol = GetColAt( 0 );
- else
- m_moveToCol = XToCol( x );
+ int posNew = XToPos(x);
+ int colNew = GetColAt(posNew);
+ // determine the position of the drop marker
int markerX;
-
- if ( m_moveToCol < 0 )
- markerX = GetColRight( GetColAt( m_numCols - 1 ) );
+ if ( x >= GetColLeft(colNew) + (GetColWidth(colNew) / 2) )
+ markerX = GetColRight(colNew);
else
- markerX = GetColLeft( m_moveToCol );
+ markerX = GetColLeft(colNew);
if ( markerX != m_dragLastPos )
{
- wxClientDC dc( m_colLabelWin );
+ wxClientDC dc( GetColLabelWindow() );
+ DoPrepareDC(dc);
int cw, ch;
- m_colLabelWin->GetClientSize( &cw, &ch );
+ GetColLabelWindow()->GetClientSize( &cw, &ch );
markerX++;
//Clean up the last indicator
if ( m_dragLastPos >= 0 )
{
- wxPen pen( m_colLabelWin->GetBackgroundColour(), 2 );
+ wxPen pen( GetColLabelWindow()->GetBackgroundColour(), 2 );
dc.SetPen(pen);
dc.DrawLine( m_dragLastPos + 1, 0, m_dragLastPos + 1, ch );
dc.SetPen(wxNullPen);
DrawColLabel( dc, XToCol( m_dragLastPos ) );
}
+ const wxColour *color;
//Moving to the same place? Don't draw a marker
- if ( (m_moveToCol == m_dragRowOrCol)
- || (GetColPos( m_moveToCol ) == GetColPos( m_dragRowOrCol ) + 1)
- || (m_moveToCol < 0 && m_dragRowOrCol == GetColAt( m_numCols - 1 )))
- {
- m_dragLastPos = -1;
- return;
- }
+ if ( colNew == m_dragRowOrCol )
+ color = wxLIGHT_GREY;
+ else
+ color = wxBLUE;
//Draw the marker
- wxPen pen( *wxBLUE, 2 );
+ wxPen pen( *color, 2 );
dc.SetPen(pen);
dc.DrawLine( markerX, 0, markerX, ch );
if (m_isDragging)
{
- if (m_colLabelWin->HasCapture())
- m_colLabelWin->ReleaseMouse();
+ if (GetColLabelWindow()->HasCapture())
+ GetColLabelWindow()->ReleaseMouse();
m_isDragging = false;
}
//
if ( event.Entering() || event.Leaving() )
{
- ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);
+ ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, GetColLabelWindow());
}
// ------------ Left button pressed
//
if ( XToEdgeOfCol(x) < 0 )
{
- col = XToCol(x);
if ( col >= 0 &&
!SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) )
{
if ( m_canDragColMove )
{
//Show button as pressed
- wxClientDC dc( m_colLabelWin );
+ wxClientDC dc( GetColLabelWindow() );
int colLeft = GetColLeft( col );
int colRight = GetColRight( col ) - 1;
- dc.SetPen( wxPen( m_colLabelWin->GetBackgroundColour(), 1 ) );
+ dc.SetPen( wxPen( GetColLabelWindow()->GetBackgroundColour(), 1 ) );
dc.DrawLine( colLeft, 1, colLeft, m_colLabelHeight-1 );
dc.DrawLine( colLeft, 1, colRight, 1 );
- ChangeCursorMode(WXGRID_CURSOR_MOVE_COL, m_colLabelWin);
+ ChangeCursorMode(WXGRID_CURSOR_MOVE_COL, GetColLabelWindow());
}
else
{
{
if ( event.ShiftDown() )
{
- m_selection->SelectBlock( 0,
- m_currentCellCoords.GetCol(),
- GetNumberRows() - 1, col,
- event.ControlDown(),
- event.ShiftDown(),
- event.AltDown(),
- event.MetaDown() );
+ m_selection->SelectBlock
+ (
+ 0, m_currentCellCoords.GetCol(),
+ GetNumberRows() - 1, col,
+ event
+ );
}
else
{
- m_selection->SelectCol( col,
- event.ControlDown(),
- event.ShiftDown(),
- event.AltDown(),
- event.MetaDown() );
+ m_selection->SelectCol(col, event);
}
}
- ChangeCursorMode(WXGRID_CURSOR_SELECT_COL, m_colLabelWin);
+ ChangeCursorMode(WXGRID_CURSOR_SELECT_COL, GetColLabelWindow());
}
}
}
// starting to drag-resize a col
//
if ( CanDragColSize() )
- ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, m_colLabelWin);
+ ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, GetColLabelWindow());
}
}
//
if ( event.LeftDClick() )
{
- col = XToEdgeOfCol(x);
- if ( col < 0 )
+ const int colEdge = XToEdgeOfCol(x);
+ if ( colEdge == -1 )
{
- col = XToCol(x);
if ( col >= 0 &&
! SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, -1, col, event ) )
{
else
{
// adjust column width depending on label text
- AutoSizeColLabelSize( col );
+ AutoSizeColLabelSize( colEdge );
- ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);
+ ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, GetColLabelWindow());
m_dragLastPos = -1;
}
}
{
case WXGRID_CURSOR_RESIZE_COL:
DoEndDragResizeCol();
-
- // Note: we are ending the event *after* doing
- // default processing in this case
- //
- SendEvent( wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event );
break;
case WXGRID_CURSOR_MOVE_COL:
- DoEndDragMoveCol();
-
- SendEvent( wxEVT_GRID_COL_MOVE, -1, m_dragRowOrCol, event );
+ if ( m_dragLastPos == -1 || col == m_dragRowOrCol )
+ {
+ // the column didn't actually move anywhere
+ if ( col != -1 )
+ DoColHeaderClick(col);
+ m_colWindow->Refresh(); // "unpress" the column
+ }
+ else
+ {
+ DoEndMoveCol(XToPos(x));
+ }
break;
case WXGRID_CURSOR_SELECT_COL:
case WXGRID_CURSOR_SELECT_CELL:
case WXGRID_CURSOR_RESIZE_ROW:
case WXGRID_CURSOR_SELECT_ROW:
- // nothing to do (?)
+ if ( col != -1 )
+ DoColHeaderClick(col);
break;
}
- ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);
+ ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, GetColLabelWindow());
m_dragLastPos = -1;
}
//
else if ( event.RightDown() )
{
- col = XToCol(x);
if ( col >= 0 &&
!SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, col, event ) )
{
//
else if ( event.RightDClick() )
{
- col = XToCol(x);
if ( col >= 0 &&
!SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, col, event ) )
{
{
// don't capture the cursor yet
if ( CanDragColSize() )
- ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, m_colLabelWin, false);
+ ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, GetColLabelWindow(), false);
}
}
else if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
{
- ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin, false);
+ ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, GetColLabelWindow(), false);
}
}
}
}
}
+void wxGrid::CancelMouseCapture()
+{
+ // cancel operation currently in progress, whatever it is
+ if ( m_winCapture )
+ {
+ m_isDragging = false;
+ m_startDragPos = wxDefaultPosition;
+
+ m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
+ m_winCapture->SetCursor( *wxSTANDARD_CURSOR );
+ m_winCapture = NULL;
+
+ // remove traces of whatever we drew on screen
+ Refresh();
+ }
+}
+
void wxGrid::ChangeCursorMode(CursorMode mode,
wxWindow *win,
bool captureMouse)
wxLogTrace(_T("grid"),
_T("wxGrid cursor mode (mouse capture for %s): %s -> %s"),
- win == m_colLabelWin ? _T("colLabelWin")
- : win ? _T("rowLabelWin")
- : _T("gridWin"),
+ win == m_colWindow ? _T("colLabelWin")
+ : win ? _T("rowLabelWin")
+ : _T("gridWin"),
cursorModes[m_cursorMode], cursorModes[mode]);
#endif
if ( m_winCapture )
{
- if (m_winCapture->HasCapture())
- m_winCapture->ReleaseMouse();
- m_winCapture = (wxWindow *)NULL;
+ m_winCapture->ReleaseMouse();
+ m_winCapture = NULL;
}
m_cursorMode = mode;
}
}
-void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
-{
- int x, y;
- wxPoint pos( event.GetPosition() );
- CalcUnscrolledPosition( pos.x, pos.y, &x, &y );
+// ----------------------------------------------------------------------------
+// grid mouse event processing
+// ----------------------------------------------------------------------------
- wxGridCellCoords coords;
- XYToCell( x, y, coords );
+void
+wxGrid::DoGridCellDrag(wxMouseEvent& event,
+ const wxGridCellCoords& coords,
+ bool isFirstDrag)
+{
+ if ( coords == wxGridNoCellCoords )
+ return; // we're outside any valid cell
- int cell_rows, cell_cols;
- bool isFirstDrag = !m_isDragging;
- GetCellSize( coords.GetRow(), coords.GetCol(), &cell_rows, &cell_cols );
- if ((cell_rows < 0) || (cell_cols < 0))
+ // Hide the edit control, so it won't interfere with drag-shrinking.
+ if ( IsCellEditControlShown() )
{
- coords.SetRow(coords.GetRow() + cell_rows);
- coords.SetCol(coords.GetCol() + cell_cols);
+ HideCellEditControl();
+ SaveEditControlValue();
}
- if ( event.Dragging() )
+ switch ( event.GetModifiers() )
{
- //wxLogDebug("pos(%d, %d) coords(%d, %d)", pos.x, pos.y, coords.GetRow(), coords.GetCol());
+ case wxMOD_CMD:
+ if ( m_selectedBlockCorner == wxGridNoCellCoords)
+ m_selectedBlockCorner = coords;
+ UpdateBlockBeingSelected(m_selectedBlockCorner, coords);
+ break;
- // Don't start doing anything until the mouse has been dragged at
- // least 3 pixels in any direction...
- if (! m_isDragging)
- {
- if (m_startDragPos == wxDefaultPosition)
+ case wxMOD_NONE:
+ if ( CanDragCell() )
{
- m_startDragPos = pos;
- return;
- }
- if (abs(m_startDragPos.x - pos.x) < 4 && abs(m_startDragPos.y - pos.y) < 4)
- return;
- }
+ if ( isFirstDrag )
+ {
+ if ( m_selectedBlockCorner == wxGridNoCellCoords)
+ m_selectedBlockCorner = coords;
- m_isDragging = true;
- if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
- {
- // Hide the edit control, so it
- // won't interfere with drag-shrinking.
- if ( IsCellEditControlShown() )
- {
- HideCellEditControl();
- SaveEditControlValue();
+ SendEvent(wxEVT_GRID_CELL_BEGIN_DRAG, coords, event);
+ return;
+ }
}
- // Have we captured the mouse yet?
- if (! m_winCapture)
- {
- m_winCapture = m_gridWin;
- m_winCapture->CaptureMouse();
- }
+ UpdateBlockBeingSelected(m_currentCellCoords, coords);
+ break;
- if ( coords != wxGridNoCellCoords )
- {
- if ( event.CmdDown() )
- {
- if ( m_selectingKeyboard == wxGridNoCellCoords)
- m_selectingKeyboard = coords;
- HighlightBlock( m_selectingKeyboard, coords );
- }
- else if ( CanDragCell() )
- {
- if ( isFirstDrag )
- {
- if ( m_selectingKeyboard == wxGridNoCellCoords)
- m_selectingKeyboard = coords;
+ default:
+ // we don't handle the other key modifiers
+ event.Skip();
+ }
+}
- SendEvent( wxEVT_GRID_CELL_BEGIN_DRAG,
- coords.GetRow(),
- coords.GetCol(),
- event );
- }
- }
- else
- {
- if ( !IsSelection() )
- {
- HighlightBlock( coords, coords );
- }
- else
- {
- HighlightBlock( m_currentCellCoords, coords );
- }
- }
+void wxGrid::DoGridLineDrag(wxMouseEvent& event, const wxGridOperations& oper)
+{
+ wxClientDC dc(m_gridWin);
+ PrepareDC(dc);
+ dc.SetLogicalFunction(wxINVERT);
- if (! IsVisible(coords))
- {
- MakeCellVisible(coords);
- // TODO: need to introduce a delay or something here. The
- // scrolling is way to fast, at least on MSW - also on GTK.
- }
- }
- }
- else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
- {
- int cw, ch, left, dummy;
- m_gridWin->GetClientSize( &cw, &ch );
- CalcUnscrolledPosition( 0, 0, &left, &dummy );
+ const wxRect rectWin(CalcUnscrolledPosition(wxPoint(0, 0)),
+ m_gridWin->GetClientSize());
- wxClientDC dc( m_gridWin );
- PrepareDC( dc );
- y = wxMax( y, GetRowTop(m_dragRowOrCol) +
- GetRowMinimalHeight(m_dragRowOrCol) );
- dc.SetLogicalFunction(wxINVERT);
- if ( m_dragLastPos >= 0 )
- {
- dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos );
- }
- dc.DrawLine( left, y, left+cw, y );
- m_dragLastPos = y;
- }
- else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL )
- {
- int cw, ch, dummy, top;
- m_gridWin->GetClientSize( &cw, &ch );
- CalcUnscrolledPosition( 0, 0, &dummy, &top );
+ // erase the previously drawn line, if any
+ if ( m_dragLastPos >= 0 )
+ oper.DrawParallelLineInRect(dc, rectWin, m_dragLastPos);
- wxClientDC dc( m_gridWin );
- PrepareDC( dc );
- x = wxMax( x, GetColLeft(m_dragRowOrCol) +
- GetColMinimalWidth(m_dragRowOrCol) );
- dc.SetLogicalFunction(wxINVERT);
- if ( m_dragLastPos >= 0 )
- {
- dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top + ch );
- }
- dc.DrawLine( x, top, x, top + ch );
- m_dragLastPos = x;
+ // we need the vertical position for rows and horizontal for columns here
+ m_dragLastPos = oper.Dual().Select(CalcUnscrolledPosition(event.GetPosition()));
+
+ // don't allow resizing beneath the minimal size
+ const int posMin = oper.GetLineStartPos(this, m_dragRowOrCol) +
+ oper.GetMinimalLineSize(this, m_dragRowOrCol);
+ if ( m_dragLastPos < posMin )
+ m_dragLastPos = posMin;
+
+ // and draw it at the new position
+ oper.DrawParallelLineInRect(dc, rectWin, m_dragLastPos);
+}
+
+void wxGrid::DoGridDragEvent(wxMouseEvent& event, const wxGridCellCoords& coords)
+{
+ if ( !m_isDragging )
+ {
+ // Don't start doing anything until the mouse has been dragged far
+ // enough
+ const wxPoint& pt = event.GetPosition();
+ if ( m_startDragPos == wxDefaultPosition )
+ {
+ m_startDragPos = pt;
+ return;
}
- return;
+ if ( abs(m_startDragPos.x - pt.x) <= DRAG_SENSITIVITY &&
+ abs(m_startDragPos.y - pt.y) <= DRAG_SENSITIVITY )
+ return;
}
- m_isDragging = false;
- m_startDragPos = wxDefaultPosition;
+ const bool isFirstDrag = !m_isDragging;
+ m_isDragging = true;
- // VZ: if we do this, the mode is reset to WXGRID_CURSOR_SELECT_CELL
- // immediately after it becomes WXGRID_CURSOR_RESIZE_ROW/COL under
- // wxGTK
-#if 0
- if ( event.Entering() || event.Leaving() )
+ switch ( m_cursorMode )
{
- ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
- m_gridWin->SetCursor( *wxSTANDARD_CURSOR );
+ case WXGRID_CURSOR_SELECT_CELL:
+ DoGridCellDrag(event, coords, isFirstDrag);
+ break;
+
+ case WXGRID_CURSOR_RESIZE_ROW:
+ DoGridLineDrag(event, wxGridRowOperations());
+ break;
+
+ case WXGRID_CURSOR_RESIZE_COL:
+ DoGridLineDrag(event, wxGridColumnOperations());
+ break;
+
+ default:
+ event.Skip();
}
- else
-#endif // 0
- // ------------ Left button pressed
- //
- if ( event.LeftDown() && coords != wxGridNoCellCoords )
+ if ( isFirstDrag )
{
- if ( !SendEvent( wxEVT_GRID_CELL_LEFT_CLICK,
- coords.GetRow(),
- coords.GetCol(),
- event ) )
- {
- if ( !event.CmdDown() )
- ClearSelection();
- if ( event.ShiftDown() )
- {
- if ( m_selection )
- {
- m_selection->SelectBlock( m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol(),
- coords.GetRow(),
- coords.GetCol(),
- event.ControlDown(),
- event.ShiftDown(),
- event.AltDown(),
- event.MetaDown() );
- }
- }
- else if ( XToEdgeOfCol(x) < 0 &&
- YToEdgeOfRow(y) < 0 )
- {
- DisableCellEditControl();
- MakeCellVisible( coords );
-
- if ( event.CmdDown() )
- {
- if ( m_selection )
- {
- m_selection->ToggleCellSelection( coords.GetRow(),
- coords.GetCol(),
- event.ControlDown(),
- event.ShiftDown(),
- event.AltDown(),
- event.MetaDown() );
- }
- m_selectingTopLeft = wxGridNoCellCoords;
- m_selectingBottomRight = wxGridNoCellCoords;
- m_selectingKeyboard = coords;
- }
- else
- {
- m_waitForSlowClick = m_currentCellCoords == coords && coords != wxGridNoCellCoords;
- SetCurrentCell( coords );
- if ( m_selection )
- {
- if ( m_selection->GetSelectionMode() !=
- wxGrid::wxGridSelectCells )
- {
- HighlightBlock( coords, coords );
- }
- }
- }
- }
- }
+ m_winCapture = m_gridWin;
+ m_winCapture->CaptureMouse();
}
+}
- // ------------ Left double click
- //
- else if ( event.LeftDClick() && coords != wxGridNoCellCoords )
+void
+wxGrid::DoGridCellLeftDown(wxMouseEvent& event,
+ const wxGridCellCoords& coords,
+ const wxPoint& pos)
+{
+ if ( SendEvent(wxEVT_GRID_CELL_LEFT_CLICK, coords, event) )
{
- DisableCellEditControl();
+ // event handled by user code, no need to do anything here
+ return;
+ }
+
+ if ( !event.CmdDown() )
+ ClearSelection();
- if ( XToEdgeOfCol(x) < 0 && YToEdgeOfRow(y) < 0 )
+ if ( event.ShiftDown() )
+ {
+ if ( m_selection )
{
- if ( !SendEvent( wxEVT_GRID_CELL_LEFT_DCLICK,
- coords.GetRow(),
- coords.GetCol(),
- event ) )
- {
- // we want double click to select a cell and start editing
- // (i.e. to behave in same way as sequence of two slow clicks):
- m_waitForSlowClick = true;
- }
+ m_selection->SelectBlock(m_currentCellCoords, coords, event);
+ m_selectedBlockCorner = coords;
}
}
-
- // ------------ Left button released
- //
- else if ( event.LeftUp() )
+ else if ( XToEdgeOfCol(pos.x) < 0 && YToEdgeOfRow(pos.y) < 0 )
{
- if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
- {
- if (m_winCapture)
- {
- if (m_winCapture->HasCapture())
- m_winCapture->ReleaseMouse();
- m_winCapture = NULL;
- }
-
- if ( coords == m_currentCellCoords && m_waitForSlowClick && CanEnableCellControl() )
- {
- ClearSelection();
- EnableCellEditControl();
-
- wxGridCellAttr *attr = GetCellAttr(coords);
- wxGridCellEditor *editor = attr->GetEditor(this, coords.GetRow(), coords.GetCol());
- editor->StartingClick();
- editor->DecRef();
- attr->DecRef();
+ DisableCellEditControl();
+ MakeCellVisible( coords );
- m_waitForSlowClick = false;
- }
- else if ( m_selectingTopLeft != wxGridNoCellCoords &&
- m_selectingBottomRight != wxGridNoCellCoords )
+ if ( event.CmdDown() )
+ {
+ if ( m_selection )
{
- if ( m_selection )
- {
- m_selection->SelectBlock( m_selectingTopLeft.GetRow(),
- m_selectingTopLeft.GetCol(),
- m_selectingBottomRight.GetRow(),
- m_selectingBottomRight.GetCol(),
- event.ControlDown(),
- event.ShiftDown(),
- event.AltDown(),
- event.MetaDown() );
- }
-
- m_selectingTopLeft = wxGridNoCellCoords;
- m_selectingBottomRight = wxGridNoCellCoords;
-
- // Show the edit control, if it has been hidden for
- // drag-shrinking.
- ShowCellEditControl();
+ m_selection->ToggleCellSelection(coords, event);
}
- }
- else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
- {
- ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
- DoEndDragResizeRow();
- // Note: we are ending the event *after* doing
- // default processing in this case
- //
- SendEvent( wxEVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event );
+ m_selectedBlockTopLeft = wxGridNoCellCoords;
+ m_selectedBlockBottomRight = wxGridNoCellCoords;
+ m_selectedBlockCorner = coords;
}
- else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL )
+ else
{
- ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
- DoEndDragResizeCol();
-
- // Note: we are ending the event *after* doing
- // default processing in this case
- //
- SendEvent( wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event );
+ m_waitForSlowClick = m_currentCellCoords == coords &&
+ coords != wxGridNoCellCoords;
+ SetCurrentCell( coords );
}
-
- m_dragLastPos = -1;
}
+}
- // ------------ Right button down
- //
- else if ( event.RightDown() && coords != wxGridNoCellCoords )
+void
+wxGrid::DoGridCellLeftDClick(wxMouseEvent& event,
+ const wxGridCellCoords& coords,
+ const wxPoint& pos)
+{
+ if ( XToEdgeOfCol(pos.x) < 0 && YToEdgeOfRow(pos.y) < 0 )
{
- DisableCellEditControl();
- if ( !SendEvent( wxEVT_GRID_CELL_RIGHT_CLICK,
- coords.GetRow(),
- coords.GetCol(),
- event ) )
+ if ( !SendEvent(wxEVT_GRID_CELL_LEFT_DCLICK, coords, event) )
{
- // no default action at the moment
+ // we want double click to select a cell and start editing
+ // (i.e. to behave in same way as sequence of two slow clicks):
+ m_waitForSlowClick = true;
}
}
+}
- // ------------ Right double click
- //
- else if ( event.RightDClick() && coords != wxGridNoCellCoords )
+void
+wxGrid::DoGridCellLeftUp(wxMouseEvent& event, const wxGridCellCoords& coords)
+{
+ if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
{
- DisableCellEditControl();
- if ( !SendEvent( wxEVT_GRID_CELL_RIGHT_DCLICK,
- coords.GetRow(),
- coords.GetCol(),
- event ) )
+ if (m_winCapture)
{
- // no default action at the moment
+ m_winCapture->ReleaseMouse();
+ m_winCapture = NULL;
}
- }
- // ------------ Moving and no button action
- //
- else if ( event.Moving() && !event.IsButton() )
- {
- if ( coords.GetRow() < 0 || coords.GetCol() < 0 )
+ if ( coords == m_currentCellCoords && m_waitForSlowClick && CanEnableCellControl() )
{
- // out of grid cell area
- ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
- return;
- }
+ ClearSelection();
+ EnableCellEditControl();
- int dragRow = YToEdgeOfRow( y );
- int dragCol = XToEdgeOfCol( x );
+ wxGridCellAttr *attr = GetCellAttr(coords);
+ wxGridCellEditor *editor = attr->GetEditor(this, coords.GetRow(), coords.GetCol());
+ editor->StartingClick();
+ editor->DecRef();
+ attr->DecRef();
- // Dragging on the corner of a cell to resize in both
- // directions is not implemented yet...
- //
- if ( dragRow >= 0 && dragCol >= 0 )
- {
- ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
- return;
+ m_waitForSlowClick = false;
}
-
- if ( dragRow >= 0 )
+ else if ( m_selectedBlockTopLeft != wxGridNoCellCoords &&
+ m_selectedBlockBottomRight != wxGridNoCellCoords )
{
- m_dragRowOrCol = dragRow;
-
- if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
+ if ( m_selection )
{
- if ( CanDragRowSize() && CanDragGridSize() )
- ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW);
+ m_selection->SelectBlock( m_selectedBlockTopLeft,
+ m_selectedBlockBottomRight,
+ event );
}
- }
- else if ( dragCol >= 0 )
- {
- m_dragRowOrCol = dragCol;
- if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
- {
- if ( CanDragColSize() && CanDragGridSize() )
- ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL);
- }
- }
- else // Neither on a row or col edge
- {
- if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
- {
- ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
- }
+ m_selectedBlockTopLeft = wxGridNoCellCoords;
+ m_selectedBlockBottomRight = wxGridNoCellCoords;
+
+ // Show the edit control, if it has been hidden for
+ // drag-shrinking.
+ ShowCellEditControl();
}
}
+ else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
+ {
+ ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+ DoEndDragResizeRow();
+
+ // Note: we are ending the event *after* doing
+ // default processing in this case
+ //
+ SendEvent( wxEVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event );
+ }
+ else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL )
+ {
+ ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+ DoEndDragResizeCol();
+ }
+
+ m_dragLastPos = -1;
}
-void wxGrid::DoEndDragResizeRow()
+void
+wxGrid::DoGridMouseMoveEvent(wxMouseEvent& WXUNUSED(event),
+ const wxGridCellCoords& coords,
+ const wxPoint& pos)
{
- if ( m_dragLastPos >= 0 )
+ if ( coords.GetRow() < 0 || coords.GetCol() < 0 )
{
- // erase the last line and resize the row
- //
- int cw, ch, left, dummy;
- m_gridWin->GetClientSize( &cw, &ch );
- CalcUnscrolledPosition( 0, 0, &left, &dummy );
+ // out of grid cell area
+ ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+ return;
+ }
- wxClientDC dc( m_gridWin );
- PrepareDC( dc );
- dc.SetLogicalFunction( wxINVERT );
- dc.DrawLine( left, m_dragLastPos, left + cw, m_dragLastPos );
- HideCellEditControl();
- SaveEditControlValue();
+ int dragRow = YToEdgeOfRow( pos.y );
+ int dragCol = XToEdgeOfCol( pos.x );
- int rowTop = GetRowTop(m_dragRowOrCol);
- SetRowSize( m_dragRowOrCol,
- wxMax( m_dragLastPos - rowTop, m_minAcceptableRowHeight ) );
+ // Dragging on the corner of a cell to resize in both
+ // directions is not implemented yet...
+ //
+ if ( dragRow >= 0 && dragCol >= 0 )
+ {
+ ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+ return;
+ }
- if ( !GetBatchCount() )
- {
- // Only needed to get the correct rect.y:
- wxRect rect ( CellToRect( m_dragRowOrCol, 0 ) );
- rect.x = 0;
- CalcScrolledPosition(0, rect.y, &dummy, &rect.y);
- rect.width = m_rowLabelWidth;
- rect.height = ch - rect.y;
- m_rowLabelWin->Refresh( true, &rect );
- rect.width = cw;
+ if ( dragRow >= 0 )
+ {
+ m_dragRowOrCol = dragRow;
- // if there is a multicell block, paint all of it
- if (m_table)
- {
- int i, cell_rows, cell_cols, subtract_rows = 0;
- int leftCol = XToCol(left);
- int rightCol = internalXToCol(left + cw);
- if (leftCol >= 0)
- {
- for (i=leftCol; i<rightCol; i++)
- {
- GetCellSize(m_dragRowOrCol, i, &cell_rows, &cell_cols);
- if (cell_rows < subtract_rows)
- subtract_rows = cell_rows;
- }
- rect.y = GetRowTop(m_dragRowOrCol + subtract_rows);
- CalcScrolledPosition(0, rect.y, &dummy, &rect.y);
- rect.height = ch - rect.y;
- }
- }
- m_gridWin->Refresh( false, &rect );
+ if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
+ {
+ if ( CanDragRowSize() && CanDragGridSize() )
+ ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, NULL, false);
}
-
- ShowCellEditControl();
}
-}
-
-
-void wxGrid::DoEndDragResizeCol()
-{
- if ( m_dragLastPos >= 0 )
+ // When using the native header window we can only resize the columns by
+ // dragging the dividers in it because we can't make it enter into the
+ // column resizing mode programmatically
+ else if ( dragCol >= 0 && !m_useNativeHeader )
{
- // erase the last line and resize the col
- //
- int cw, ch, dummy, top;
- m_gridWin->GetClientSize( &cw, &ch );
- CalcUnscrolledPosition( 0, 0, &dummy, &top );
+ m_dragRowOrCol = dragCol;
- wxClientDC dc( m_gridWin );
- PrepareDC( dc );
- dc.SetLogicalFunction( wxINVERT );
- dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top + ch );
- HideCellEditControl();
- SaveEditControlValue();
-
- int colLeft = GetColLeft(m_dragRowOrCol);
- SetColSize( m_dragRowOrCol,
- wxMax( m_dragLastPos - colLeft,
- GetColMinimalWidth(m_dragRowOrCol) ) );
-
- if ( !GetBatchCount() )
+ if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
{
- // Only needed to get the correct rect.x:
- wxRect rect ( CellToRect( 0, m_dragRowOrCol ) );
- rect.y = 0;
- CalcScrolledPosition(rect.x, 0, &rect.x, &dummy);
- rect.width = cw - rect.x;
- rect.height = m_colLabelHeight;
- m_colLabelWin->Refresh( true, &rect );
- rect.height = ch;
-
- // if there is a multicell block, paint all of it
- if (m_table)
- {
- int i, cell_rows, cell_cols, subtract_cols = 0;
- int topRow = YToRow(top);
- int bottomRow = internalYToRow(top + cw);
- if (topRow >= 0)
- {
- for (i=topRow; i<bottomRow; i++)
- {
- GetCellSize(i, m_dragRowOrCol, &cell_rows, &cell_cols);
- if (cell_cols < subtract_cols)
- subtract_cols = cell_cols;
- }
-
- rect.x = GetColLeft(m_dragRowOrCol + subtract_cols);
- CalcScrolledPosition(rect.x, 0, &rect.x, &dummy);
- rect.width = cw - rect.x;
- }
- }
-
- m_gridWin->Refresh( false, &rect );
+ if ( CanDragColSize() && CanDragGridSize() )
+ ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, NULL, false);
+ }
+ }
+ else // Neither on a row or col edge
+ {
+ if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
+ {
+ ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
}
-
- ShowCellEditControl();
}
}
-void wxGrid::DoEndDragMoveCol()
+void wxGrid::ProcessGridCellMouseEvent(wxMouseEvent& event)
{
- //The user clicked on the column but didn't actually drag
- if ( m_dragLastPos < 0 )
+ const wxPoint pos = CalcUnscrolledPosition(event.GetPosition());
+
+ // coordinates of the cell under mouse
+ wxGridCellCoords coords = XYToCell(pos);
+
+ int cell_rows, cell_cols;
+ GetCellSize( coords.GetRow(), coords.GetCol(), &cell_rows, &cell_cols );
+ if ( (cell_rows < 0) || (cell_cols < 0) )
{
- m_colLabelWin->Refresh(); //Do this to "unpress" the column
- return;
+ coords.SetRow(coords.GetRow() + cell_rows);
+ coords.SetCol(coords.GetCol() + cell_cols);
}
- int newPos;
- if ( m_moveToCol == -1 )
- newPos = m_numCols - 1;
- else
+ if ( event.Dragging() )
{
- newPos = GetColPos( m_moveToCol );
- if ( newPos > GetColPos( m_dragRowOrCol ) )
- newPos--;
+ if ( event.LeftIsDown() )
+ DoGridDragEvent(event, coords);
+ else
+ event.Skip();
+ return;
}
- SetColPos( m_dragRowOrCol, newPos );
-}
+ m_isDragging = false;
+ m_startDragPos = wxDefaultPosition;
-void wxGrid::SetColPos( int colID, int newPos )
-{
- if ( m_colAt.IsEmpty() )
+ // VZ: if we do this, the mode is reset to WXGRID_CURSOR_SELECT_CELL
+ // immediately after it becomes WXGRID_CURSOR_RESIZE_ROW/COL under
+ // wxGTK
+#if 0
+ if ( event.Entering() || event.Leaving() )
{
- m_colAt.Alloc( m_numCols );
+ ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+ m_gridWin->SetCursor( *wxSTANDARD_CURSOR );
+ }
+#endif // 0
- int i;
- for ( i = 0; i < m_numCols; i++ )
+ // deal with various button presses
+ if ( event.IsButton() )
+ {
+ if ( coords != wxGridNoCellCoords )
{
- m_colAt.Add( i );
- }
- }
+ DisableCellEditControl();
- int oldPos = GetColPos( colID );
+ if ( event.LeftDown() )
+ DoGridCellLeftDown(event, coords, pos);
+ else if ( event.LeftDClick() )
+ DoGridCellLeftDClick(event, coords, pos);
+ else if ( event.RightDown() )
+ SendEvent(wxEVT_GRID_CELL_RIGHT_CLICK, coords, event);
+ else if ( event.RightDClick() )
+ SendEvent(wxEVT_GRID_CELL_RIGHT_DCLICK, coords, event);
+ }
- //Reshuffle the m_colAt array
- if ( newPos > oldPos )
- {
- int i;
- for ( i = oldPos; i < newPos; i++ )
+ // this one should be called even if we're not over any cell
+ if ( event.LeftUp() )
{
- m_colAt[i] = m_colAt[i+1];
+ DoGridCellLeftUp(event, coords);
}
}
- else
+ else if ( event.Moving() )
{
- int i;
- for ( i = oldPos; i > newPos; i-- )
- {
- m_colAt[i] = m_colAt[i-1];
- }
+ DoGridMouseMoveEvent(event, coords, pos);
+ }
+ else // unknown mouse event?
+ {
+ event.Skip();
}
+}
- m_colAt[newPos] = colID;
+void wxGrid::DoEndDragResizeLine(const wxGridOperations& oper)
+{
+ if ( m_dragLastPos == -1 )
+ return;
- //Recalculate the column rights
- if ( !m_colWidths.IsEmpty() )
- {
- int colRight = 0;
- int colPos;
- for ( colPos = 0; colPos < m_numCols; colPos++ )
- {
- int colID = GetColAt( colPos );
+ const wxGridOperations& doper = oper.Dual();
- colRight += m_colWidths[colID];
- m_colRights[colID] = colRight;
- }
- }
+ const wxSize size = m_gridWin->GetClientSize();
- m_colLabelWin->Refresh();
- m_gridWin->Refresh();
-}
+ const wxPoint ptOrigin = CalcUnscrolledPosition(wxPoint(0, 0));
+ // erase the last line we drew
+ wxClientDC dc(m_gridWin);
+ PrepareDC(dc);
+ dc.SetLogicalFunction(wxINVERT);
+ const int posLineStart = oper.Select(ptOrigin);
+ const int posLineEnd = oper.Select(ptOrigin) + oper.Select(size);
-void wxGrid::EnableDragColMove( bool enable )
-{
- if ( m_canDragColMove == enable )
- return;
+ oper.DrawParallelLine(dc, posLineStart, posLineEnd, m_dragLastPos);
- m_canDragColMove = enable;
+ // temporarily hide the edit control before resizing
+ HideCellEditControl();
+ SaveEditControlValue();
- if ( !m_canDragColMove )
+ // do resize the line
+ const int lineStart = oper.GetLineStartPos(this, m_dragRowOrCol);
+ oper.SetLineSize(this, m_dragRowOrCol,
+ wxMax(m_dragLastPos - lineStart,
+ oper.GetMinimalLineSize(this, m_dragRowOrCol)));
+
+ m_dragLastPos = -1;
+
+ // refresh now if we're not frozen
+ if ( !GetBatchCount() )
{
- m_colAt.Clear();
+ // we need to refresh everything beyond the resized line in the header
+ // window
+
+ // get the position from which to refresh in the other direction
+ wxRect rect(CellToRect(oper.MakeCoords(m_dragRowOrCol, 0)));
+ rect.SetPosition(CalcScrolledPosition(rect.GetPosition()));
+
+ // we only need the ordinate (for rows) or abscissa (for columns) here,
+ // and need to cover the entire window in the other direction
+ oper.Select(rect) = 0;
+
+ wxRect rectHeader(rect.GetPosition(),
+ oper.MakeSize
+ (
+ oper.GetHeaderWindowSize(this),
+ doper.Select(size) - doper.Select(rect)
+ ));
- //Recalculate the column rights
- if ( !m_colWidths.IsEmpty() )
+ oper.GetHeaderWindow(this)->Refresh(true, &rectHeader);
+
+
+ // also refresh the grid window: extend the rectangle
+ if ( m_table )
{
- int colRight = 0;
- int colPos;
- for ( colPos = 0; colPos < m_numCols; colPos++ )
+ oper.SelectSize(rect) = oper.Select(size);
+
+ int subtractLines = 0;
+ const int lineStart = oper.PosToLine(this, posLineStart);
+ if ( lineStart >= 0 )
{
- colRight += m_colWidths[colPos];
- m_colRights[colPos] = colRight;
+ // ensure that if we have a multi-cell block we redraw all of
+ // it by increasing the refresh area to cover it entirely if a
+ // part of it is affected
+ const int lineEnd = oper.PosToLine(this, posLineEnd, true);
+ for ( int line = lineStart; line < lineEnd; line++ )
+ {
+ int cellLines = oper.Select(
+ GetCellSize(oper.MakeCoords(m_dragRowOrCol, line)));
+ if ( cellLines < subtractLines )
+ subtractLines = cellLines;
+ }
}
- }
- m_colLabelWin->Refresh();
- m_gridWin->Refresh();
+ int startPos =
+ oper.GetLineStartPos(this, m_dragRowOrCol + subtractLines);
+ startPos = doper.CalcScrolledPosition(this, startPos);
+
+ doper.Select(rect) = startPos;
+ doper.SelectSize(rect) = doper.Select(size) - startPos;
+
+ m_gridWin->Refresh(false, &rect);
+ }
}
+
+ // show the edit control back again
+ ShowCellEditControl();
}
+void wxGrid::DoEndDragResizeRow()
+{
+ DoEndDragResizeLine(wxGridRowOperations());
+}
-//
-// ------ interaction with data model
-//
-bool wxGrid::ProcessTableMessage( wxGridTableMessage& msg )
+void wxGrid::DoEndDragResizeCol(wxMouseEvent *event)
{
- switch ( msg.GetId() )
- {
- case wxGRIDTABLE_REQUEST_VIEW_GET_VALUES:
- return GetModelValues();
+ DoEndDragResizeLine(wxGridColumnOperations());
- case wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES:
- return SetModelValues();
+ // Note: we are ending the event *after* doing
+ // default processing in this case
+ //
+ if ( event )
+ SendEvent( wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, *event );
+ else
+ SendEvent( wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol );
+}
- case wxGRIDTABLE_NOTIFY_ROWS_INSERTED:
- case wxGRIDTABLE_NOTIFY_ROWS_APPENDED:
- case wxGRIDTABLE_NOTIFY_ROWS_DELETED:
- case wxGRIDTABLE_NOTIFY_COLS_INSERTED:
- case wxGRIDTABLE_NOTIFY_COLS_APPENDED:
- case wxGRIDTABLE_NOTIFY_COLS_DELETED:
- return Redimension( msg );
+void wxGrid::DoStartMoveCol(int col)
+{
+ m_dragRowOrCol = col;
+}
- default:
- return false;
- }
+void wxGrid::DoEndMoveCol(int pos)
+{
+ wxASSERT_MSG( m_dragRowOrCol != -1, "no matching DoStartMoveCol?" );
+
+ if ( SendEvent(wxEVT_GRID_COL_MOVE, -1, m_dragRowOrCol) != -1 )
+ SetColPos(m_dragRowOrCol, pos);
+ //else: vetoed by user
+
+ m_dragRowOrCol = -1;
}
-// The behaviour of this function depends on the grid table class
-// Clear() function. For the default wxGridStringTable class the
-// behavious is to replace all cell contents with wxEmptyString but
-// not to change the number of rows or cols.
-//
-void wxGrid::ClearGrid()
+void wxGrid::RefreshAfterColPosChange()
{
- if ( m_table )
+ // recalculate the column rights as the column positions have changed,
+ // unless we calculate them dynamically because all columns widths are the
+ // same and it's easy to do
+ if ( !m_colWidths.empty() )
{
- if (IsCellEditControlEnabled())
- DisableCellEditControl();
+ int colRight = 0;
+ for ( int colPos = 0; colPos < m_numCols; colPos++ )
+ {
+ int colID = GetColAt( colPos );
- m_table->Clear();
- if (!GetBatchCount())
- m_gridWin->Refresh();
+ colRight += m_colWidths[colID];
+ m_colRights[colID] = colRight;
+ }
}
+
+ // and make the changes visible
+ if ( m_useNativeHeader )
+ {
+ if ( m_colAt.empty() )
+ GetGridColHeader()->ResetColumnsOrder();
+ else
+ GetGridColHeader()->SetColumnsOrder(m_colAt);
+ }
+ else
+ {
+ m_colWindow->Refresh();
+ }
+ m_gridWin->Refresh();
}
-bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
+void wxGrid::SetColumnsOrder(const wxArrayInt& order)
{
- // TODO: something with updateLabels flag
+ m_colAt = order;
+
+ RefreshAfterColPosChange();
+}
- if ( !m_created )
+void wxGrid::SetColPos(int idx, int pos)
+{
+ // we're going to need m_colAt now, initialize it if needed
+ if ( m_colAt.empty() )
{
- wxFAIL_MSG( wxT("Called wxGrid::InsertRows() before calling CreateGrid()") );
- return false;
+ m_colAt.reserve(m_numCols);
+ for ( int i = 0; i < m_numCols; i++ )
+ m_colAt.push_back(i);
}
- if ( m_table )
- {
- if (IsCellEditControlEnabled())
- DisableCellEditControl();
+ wxHeaderCtrl::MoveColumnInOrderArray(m_colAt, idx, pos);
- bool done = m_table->InsertRows( pos, numRows );
- return done;
+ RefreshAfterColPosChange();
+}
- // the table will have sent the results of the insert row
- // operation to this view object as a grid table message
- }
+void wxGrid::ResetColPos()
+{
+ m_colAt.clear();
- return false;
+ RefreshAfterColPosChange();
}
-bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) )
+void wxGrid::EnableDragColMove( bool enable )
{
- // TODO: something with updateLabels flag
+ if ( m_canDragColMove == enable )
+ return;
- if ( !m_created )
+ if ( m_useNativeHeader )
{
- wxFAIL_MSG( wxT("Called wxGrid::AppendRows() before calling CreateGrid()") );
- return false;
+ // update all columns to make them [not] reorderable
+ GetGridColHeader()->SetColumnCount(m_numCols);
}
- if ( m_table )
- {
- bool done = m_table && m_table->AppendRows( numRows );
- return done;
-
- // the table will have sent the results of the append row
- // operation to this view object as a grid table message
- }
+ m_canDragColMove = enable;
- return false;
+ // we use to call ResetColPos() from here if !enable but this doesn't seem
+ // right as it would mean there would be no way to "freeze" the current
+ // columns order by disabling moving them after putting them in the desired
+ // order, whereas now you can always call ResetColPos() manually if needed
}
-bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
-{
- // TODO: something with updateLabels flag
- if ( !m_created )
+//
+// ------ interaction with data model
+//
+bool wxGrid::ProcessTableMessage( wxGridTableMessage& msg )
+{
+ switch ( msg.GetId() )
{
- wxFAIL_MSG( wxT("Called wxGrid::DeleteRows() before calling CreateGrid()") );
- return false;
- }
+ case wxGRIDTABLE_REQUEST_VIEW_GET_VALUES:
+ return GetModelValues();
- if ( m_table )
- {
- if (IsCellEditControlEnabled())
- DisableCellEditControl();
+ case wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES:
+ return SetModelValues();
- bool done = m_table->DeleteRows( pos, numRows );
- return done;
- // the table will have sent the results of the delete row
- // operation to this view object as a grid table message
- }
+ case wxGRIDTABLE_NOTIFY_ROWS_INSERTED:
+ case wxGRIDTABLE_NOTIFY_ROWS_APPENDED:
+ case wxGRIDTABLE_NOTIFY_ROWS_DELETED:
+ case wxGRIDTABLE_NOTIFY_COLS_INSERTED:
+ case wxGRIDTABLE_NOTIFY_COLS_APPENDED:
+ case wxGRIDTABLE_NOTIFY_COLS_DELETED:
+ return Redimension( msg );
- return false;
+ default:
+ return false;
+ }
}
-bool wxGrid::InsertCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
+// The behaviour of this function depends on the grid table class
+// Clear() function. For the default wxGridStringTable class the
+// behaviour is to replace all cell contents with wxEmptyString but
+// not to change the number of rows or cols.
+//
+void wxGrid::ClearGrid()
{
- // TODO: something with updateLabels flag
-
- if ( !m_created )
- {
- wxFAIL_MSG( wxT("Called wxGrid::InsertCols() before calling CreateGrid()") );
- return false;
- }
-
if ( m_table )
{
if (IsCellEditControlEnabled())
DisableCellEditControl();
- bool done = m_table->InsertCols( pos, numCols );
- return done;
- // the table will have sent the results of the insert col
- // operation to this view object as a grid table message
+ m_table->Clear();
+ if (!GetBatchCount())
+ m_gridWin->Refresh();
}
-
- return false;
}
-bool wxGrid::AppendCols( int numCols, bool WXUNUSED(updateLabels) )
+bool
+wxGrid::DoModifyLines(bool (wxGridTableBase::*funcModify)(size_t, size_t),
+ int pos, int num, bool WXUNUSED(updateLabels) )
{
- // TODO: something with updateLabels flag
+ wxCHECK_MSG( m_created, false, "must finish creating the grid first" );
- if ( !m_created )
- {
- wxFAIL_MSG( wxT("Called wxGrid::AppendCols() before calling CreateGrid()") );
+ if ( !m_table )
return false;
- }
- if ( m_table )
- {
- bool done = m_table->AppendCols( numCols );
- return done;
- // the table will have sent the results of the append col
- // operation to this view object as a grid table message
- }
+ if ( IsCellEditControlEnabled() )
+ DisableCellEditControl();
- return false;
+ return (m_table->*funcModify)(pos, num);
+
+ // the table will have sent the results of the insert row
+ // operation to this view object as a grid table message
}
-bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
+bool
+wxGrid::DoAppendLines(bool (wxGridTableBase::*funcAppend)(size_t),
+ int num, bool WXUNUSED(updateLabels))
{
- // TODO: something with updateLabels flag
+ wxCHECK_MSG( m_created, false, "must finish creating the grid first" );
- if ( !m_created )
- {
- wxFAIL_MSG( wxT("Called wxGrid::DeleteCols() before calling CreateGrid()") );
+ if ( !m_table )
return false;
- }
- if ( m_table )
- {
- if (IsCellEditControlEnabled())
- DisableCellEditControl();
-
- bool done = m_table->DeleteCols( pos, numCols );
- return done;
- // the table will have sent the results of the delete col
- // operation to this view object as a grid table message
- }
-
- return false;
+ return (m_table->*funcAppend)(num);
}
//
// ----- event handlers
//
-// Generate a grid event based on a mouse event and
-// return the result of ProcessEvent()
-//
-int wxGrid::SendEvent( const wxEventType type,
- int row, int col,
- wxMouseEvent& mouseEv )
+// Generate a grid event based on a mouse event and return:
+// -1 if the event was vetoed
+// +1 if the event was processed (but not vetoed)
+// 0 if the event wasn't handled
+int
+wxGrid::SendEvent(const wxEventType type,
+ int row, int col,
+ wxMouseEvent& mouseEv)
{
bool claimed, vetoed;
rowOrCol,
mouseEv.GetX() + GetRowLabelSize(),
mouseEv.GetY() + GetColLabelSize(),
- mouseEv.ControlDown(),
- mouseEv.ShiftDown(),
- mouseEv.AltDown(),
- mouseEv.MetaDown() );
+ mouseEv);
claimed = GetEventHandler()->ProcessEvent(gridEvt);
vetoed = !gridEvt.IsAllowed();
wxGridRangeSelectEvent gridEvt( GetId(),
type,
this,
- m_selectingTopLeft,
- m_selectingBottomRight,
+ m_selectedBlockTopLeft,
+ m_selectedBlockBottomRight,
true,
- mouseEv.ControlDown(),
- mouseEv.ShiftDown(),
- mouseEv.AltDown(),
- mouseEv.MetaDown() );
+ mouseEv);
claimed = GetEventHandler()->ProcessEvent(gridEvt);
vetoed = !gridEvt.IsAllowed();
pos.y += GetColLabelSize();
if ( mouseEv.GetEventObject() == GetGridColLabelWindow() )
pos.x += GetRowLabelSize();
-
+
wxGridEvent gridEvt( GetId(),
type,
this,
pos.x,
pos.y,
false,
- mouseEv.ControlDown(),
- mouseEv.ShiftDown(),
- mouseEv.AltDown(),
- mouseEv.MetaDown() );
+ mouseEv);
claimed = GetEventHandler()->ProcessEvent(gridEvt);
vetoed = !gridEvt.IsAllowed();
}
mouseEv.GetX() + GetRowLabelSize(),
mouseEv.GetY() + GetColLabelSize(),
false,
- mouseEv.ControlDown(),
- mouseEv.ShiftDown(),
- mouseEv.AltDown(),
- mouseEv.MetaDown() );
+ mouseEv);
claimed = GetEventHandler()->ProcessEvent(gridEvt);
vetoed = !gridEvt.IsAllowed();
}
return claimed ? 1 : 0;
}
-// Generate a grid event of specified type and return the result
-// of ProcessEvent().
+// Generate a grid event of specified type, return value same as above
//
-int wxGrid::SendEvent( const wxEventType type,
- int row, int col )
+int
+wxGrid::SendEvent(const wxEventType type, int row, int col, const wxString& s)
{
bool claimed, vetoed;
else
{
wxGridEvent gridEvt( GetId(), type, this, row, col );
+ gridEvt.SetString(s);
claimed = GetEventHandler()->ProcessEvent(gridEvt);
vetoed = !gridEvt.IsAllowed();
{
// Don't do anything if between Begin/EndBatch...
// EndBatch() will do all this on the last nested one anyway.
- if (! GetBatchCount())
+ if ( m_created && !GetBatchCount() )
{
// Refresh to get correct scrolled position:
wxScrolledWindow::Refresh(eraseb, rect);
if ( width_cell > 0 && height_label > 0 )
{
wxRect anotherrect(x, rect_y, width_cell, height_label);
- m_colLabelWin->Refresh(eraseb, &anotherrect);
+ m_colWindow->Refresh(eraseb, &anotherrect);
}
// Paint row labels part intersecting rect.
else
{
m_cornerLabelWin->Refresh(eraseb, NULL);
- m_colLabelWin->Refresh(eraseb, NULL);
+ m_colWindow->Refresh(eraseb, NULL);
m_rowLabelWin->Refresh(eraseb, NULL);
m_gridWin->Refresh(eraseb, NULL);
}
}
}
-void wxGrid::OnSize( wxSizeEvent& event )
+void wxGrid::OnSize(wxSizeEvent& WXUNUSED(event))
{
- // position the child windows
- CalcWindowSizes();
-
- // don't call CalcDimensions() from here, the base class handles the size
- // changes itself
- event.Skip();
+ if (m_targetWindow != this) // check whether initialisation has been done
+ {
+ // reposition our children windows
+ CalcWindowSizes();
+ }
}
void wxGrid::OnKeyDown( wxKeyEvent& event )
else if (event.GetKeyCode() == WXK_LEFT)
event.m_keyCode = WXK_RIGHT;
}
-
+
// try local handlers
switch ( event.GetKeyCode() )
{
case WXK_HOME:
if ( event.ControlDown() )
{
- MakeCellVisible( 0, 0 );
- SetCurrentCell( 0, 0 );
+ GoToCell(0, 0);
}
else
{
case WXK_END:
if ( event.ControlDown() )
{
- MakeCellVisible( m_numRows - 1, m_numCols - 1 );
- SetCurrentCell( m_numRows - 1, m_numCols - 1 );
+ GoToCell(m_numRows - 1, m_numCols - 1);
}
else
{
break;
case WXK_SPACE:
- if ( event.ControlDown() )
+ // Ctrl-Space selects the current column, Shift-Space -- the
+ // current row and Ctrl-Shift-Space -- everything
+ switch ( m_selection ? event.GetModifiers() : wxMOD_NONE )
{
- if ( m_selection )
- {
- m_selection->ToggleCellSelection(
- m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol(),
- event.ControlDown(),
- event.ShiftDown(),
- event.AltDown(),
- event.MetaDown() );
- }
- break;
- }
+ case wxMOD_CONTROL:
+ m_selection->SelectCol(m_currentCellCoords.GetCol());
+ break;
- if ( !IsEditable() )
- MoveCursorRight( false );
- else
- event.Skip();
+ case wxMOD_SHIFT:
+ m_selection->SelectRow(m_currentCellCoords.GetRow());
+ break;
+
+ case wxMOD_CONTROL | wxMOD_SHIFT:
+ m_selection->SelectBlock(0, 0,
+ m_numRows - 1, m_numCols - 1);
+ break;
+
+ case wxMOD_NONE:
+ if ( !IsEditable() )
+ {
+ MoveCursorRight(false);
+ break;
+ }
+ //else: fall through
+
+ default:
+ event.Skip();
+ }
break;
default:
//
if ( event.GetKeyCode() == WXK_SHIFT )
{
- if ( m_selectingTopLeft != wxGridNoCellCoords &&
- m_selectingBottomRight != wxGridNoCellCoords )
+ if ( m_selectedBlockTopLeft != wxGridNoCellCoords &&
+ m_selectedBlockBottomRight != wxGridNoCellCoords )
{
if ( m_selection )
{
m_selection->SelectBlock(
- m_selectingTopLeft.GetRow(),
- m_selectingTopLeft.GetCol(),
- m_selectingBottomRight.GetRow(),
- m_selectingBottomRight.GetCol(),
- event.ControlDown(),
- true,
- event.AltDown(),
- event.MetaDown() );
+ m_selectedBlockTopLeft,
+ m_selectedBlockBottomRight,
+ event);
}
}
- m_selectingTopLeft = wxGridNoCellCoords;
- m_selectingBottomRight = wxGridNoCellCoords;
- m_selectingKeyboard = wxGridNoCellCoords;
+ m_selectedBlockTopLeft = wxGridNoCellCoords;
+ m_selectedBlockBottomRight = wxGridNoCellCoords;
+ m_selectedBlockCorner = wxGridNoCellCoords;
}
}
{
}
-void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
+bool wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
{
- if ( SendEvent( wxEVT_GRID_SELECT_CELL, coords.GetRow(), coords.GetCol() ) )
+ if ( SendEvent(wxEVT_GRID_SELECT_CELL, coords) == -1 )
{
- // the event has been intercepted - do nothing
- return;
+ // the event has been vetoed - do nothing
+ return false;
}
-#if !(defined(__WXMAC__) && wxMAC_USE_CORE_GRAPHICS)
+#if !defined(__WXMAC__)
wxClientDC dc( m_gridWin );
PrepareDC( dc );
#endif
// Otherwise refresh redraws the highlight!
m_currentCellCoords = coords;
-#if defined(__WXMAC__) && wxMAC_USE_CORE_GRAPHICS
+#if defined(__WXMAC__)
m_gridWin->Refresh(true /*, & r */);
#else
DrawGridCellArea( dc, cells );
m_currentCellCoords = coords;
wxGridCellAttr *attr = GetCellAttr( coords );
-#if !(defined(__WXMAC__) && wxMAC_USE_CORE_GRAPHICS)
+#if !defined(__WXMAC__)
DrawCellHighlight( dc, attr );
#endif
attr->DecRef();
+
+ return true;
}
-void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCol )
+void
+wxGrid::UpdateBlockBeingSelected(int topRow, int leftCol,
+ int bottomRow, int rightCol)
{
- int temp;
- wxGridCellCoords updateTopLeft, updateBottomRight;
-
if ( m_selection )
{
- if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows )
- {
- leftCol = 0;
- rightCol = GetNumberCols() - 1;
- }
- else if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns )
+ switch ( m_selection->GetSelectionMode() )
{
- topRow = 0;
- bottomRow = GetNumberRows() - 1;
+ default:
+ wxFAIL_MSG( "unknown selection mode" );
+ // fall through
+
+ case wxGridSelectCells:
+ // arbitrary blocks selection allowed so just use the cell
+ // coordinates as is
+ break;
+
+ case wxGridSelectRows:
+ // only full rows selection allowd, ensure that we do select
+ // full rows
+ leftCol = 0;
+ rightCol = GetNumberCols() - 1;
+ break;
+
+ case wxGridSelectColumns:
+ // same as above but for columns
+ topRow = 0;
+ bottomRow = GetNumberRows() - 1;
+ break;
+
+ case wxGridSelectRowsOrColumns:
+ // in this mode we can select only full rows or full columns so
+ // it doesn't make sense to select blocks at all (and we can't
+ // extend the block because there is no preferred direction, we
+ // could only extend it to cover the entire grid but this is
+ // not useful)
+ return;
}
}
- if ( topRow > bottomRow )
- {
- temp = topRow;
- topRow = bottomRow;
- bottomRow = temp;
- }
+ m_selectedBlockCorner = wxGridCellCoords(bottomRow, rightCol);
+ MakeCellVisible(m_selectedBlockCorner);
- if ( leftCol > rightCol )
- {
- temp = leftCol;
- leftCol = rightCol;
- rightCol = temp;
- }
+ EnsureFirstLessThanSecond(topRow, bottomRow);
+ EnsureFirstLessThanSecond(leftCol, rightCol);
- updateTopLeft = wxGridCellCoords( topRow, leftCol );
- updateBottomRight = wxGridCellCoords( bottomRow, rightCol );
+ wxGridCellCoords updateTopLeft = wxGridCellCoords(topRow, leftCol),
+ updateBottomRight = wxGridCellCoords(bottomRow, rightCol);
// First the case that we selected a completely new area
- if ( m_selectingTopLeft == wxGridNoCellCoords ||
- m_selectingBottomRight == wxGridNoCellCoords )
+ if ( m_selectedBlockTopLeft == wxGridNoCellCoords ||
+ m_selectedBlockBottomRight == wxGridNoCellCoords )
{
wxRect rect;
rect = BlockToDeviceRect( wxGridCellCoords ( topRow, leftCol ),
}
// Now handle changing an existing selection area.
- else if ( m_selectingTopLeft != updateTopLeft ||
- m_selectingBottomRight != updateBottomRight )
+ else if ( m_selectedBlockTopLeft != updateTopLeft ||
+ m_selectedBlockBottomRight != updateBottomRight )
{
// Compute two optimal update rectangles:
// Either one rectangle is a real subset of the
int i;
// Store intermediate values
- wxCoord oldLeft = m_selectingTopLeft.GetCol();
- wxCoord oldTop = m_selectingTopLeft.GetRow();
- wxCoord oldRight = m_selectingBottomRight.GetCol();
- wxCoord oldBottom = m_selectingBottomRight.GetRow();
+ wxCoord oldLeft = m_selectedBlockTopLeft.GetCol();
+ wxCoord oldTop = m_selectedBlockTopLeft.GetRow();
+ wxCoord oldRight = m_selectedBlockBottomRight.GetCol();
+ wxCoord oldBottom = m_selectedBlockBottomRight.GetRow();
// Determine the outer/inner coordinates.
- if (oldLeft > leftCol)
- {
- temp = oldLeft;
- oldLeft = leftCol;
- leftCol = temp;
- }
- if (oldTop > topRow )
- {
- temp = oldTop;
- oldTop = topRow;
- topRow = temp;
- }
- if (oldRight < rightCol )
- {
- temp = oldRight;
- oldRight = rightCol;
- rightCol = temp;
- }
- if (oldBottom < bottomRow)
- {
- temp = oldBottom;
- oldBottom = bottomRow;
- bottomRow = temp;
- }
+ EnsureFirstLessThanSecond(oldLeft, leftCol);
+ EnsureFirstLessThanSecond(oldTop, topRow);
+ EnsureFirstLessThanSecond(rightCol, oldRight);
+ EnsureFirstLessThanSecond(bottomRow, oldBottom);
// Now, either the stuff marked old is the outer
// rectangle or we don't have a situation where one
}
// change selection
- m_selectingTopLeft = updateTopLeft;
- m_selectingBottomRight = updateBottomRight;
+ m_selectedBlockTopLeft = updateTopLeft;
+ m_selectedBlockBottomRight = updateBottomRight;
}
//
int left, top;
CalcUnscrolledPosition( 0, 0, &left, &top );
- dc.SetBrush( wxBrush(GetDefaultCellBackgroundColour(), wxSOLID) );
+ dc.SetBrush(GetDefaultCellBackgroundColour());
dc.SetPen( *wxTRANSPARENT_PEN );
if ( right > rightCol )
return;
// we draw the cell border ourselves
-#if !WXGRID_DRAW_LINES
- if ( m_gridLinesEnabled )
- DrawCellBorder( dc, coords );
-#endif
-
wxGridCellAttr* attr = GetCellAttr(row, col);
bool isCurrent = coords == m_currentCellCoords;
void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr )
{
+ // don't show highlight when the grid doesn't have focus
+ if ( !HasFocus() )
+ return;
+
int row = m_currentCellCoords.GetRow();
int col = m_currentCellCoords.GetCol();
// Now draw the rectangle
// use the cellHighlightColour if the cell is inside a selection, this
// will ensure the cell is always visible.
- dc.SetPen(wxPen(IsInSelection(row,col) ? m_selectionForeground : m_cellHighlightColour, penWidth, wxSOLID));
+ dc.SetPen(wxPen(IsInSelection(row,col) ? m_selectionForeground
+ : m_cellHighlightColour,
+ penWidth));
dc.SetBrush(*wxTRANSPARENT_BRUSH);
dc.DrawRectangle(rect);
}
-
-#if 0
- // VZ: my experiments with 3D borders...
-
- // how to properly set colours for arbitrary bg?
- wxCoord x1 = rect.x,
- y1 = rect.y,
- x2 = rect.x + rect.width - 1,
- y2 = rect.y + rect.height - 1;
-
- dc.SetPen(*wxWHITE_PEN);
- dc.DrawLine(x1, y1, x2, y1);
- dc.DrawLine(x1, y1, x1, y2);
-
- dc.DrawLine(x1 + 1, y2 - 1, x2 - 1, y2 - 1);
- dc.DrawLine(x2 - 1, y1 + 1, x2 - 1, y2);
-
- dc.SetPen(*wxBLACK_PEN);
- dc.DrawLine(x1, y2, x2, y2);
- dc.DrawLine(x2, y1, x2, y2 + 1);
-#endif
}
wxPen wxGrid::GetDefaultGridLinePen()
{
- return wxPen(GetGridLineColour(), 1, wxSOLID);
+ return wxPen(GetGridLineColour());
}
wxPen wxGrid::GetRowGridLinePen(int WXUNUSED(row))
size_t count = cells.GetCount();
for ( size_t n = 0; n < count; n++ )
{
- if ( cells[n] == m_currentCellCoords )
+ wxGridCellCoords cell = cells[n];
+
+ // If we are using attributes, then we may have just exposed another
+ // cell in a partially-visible merged cluster of cells. If the "anchor"
+ // (upper left) cell of this merged cluster is the cell indicated by
+ // m_currentCellCoords, then we need to refresh the cell highlight even
+ // though the "anchor" itself is not part of our update segment.
+ if ( CanHaveAttributes() )
+ {
+ int rows = 0,
+ cols = 0;
+ GetCellSize(cell.GetRow(), cell.GetCol(), &rows, &cols);
+
+ if ( rows < 0 )
+ cell.SetRow(cell.GetRow() + rows);
+
+ if ( cols < 0 )
+ cell.SetCol(cell.GetCol() + cols);
+ }
+
+ if ( cell == m_currentCellCoords )
{
wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords);
DrawCellHighlight(dc, attr);
}
}
-// TODO: remove this ???
// This is used to redraw all grid lines e.g. when the grid line colour
// has been changed
//
void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
{
-#if !WXGRID_DRAW_LINES
- return;
-#endif
-
- if ( !m_gridLinesEnabled || !m_numRows || !m_numCols )
+ if ( !m_gridLinesEnabled )
return;
int top, bottom, left, right;
-#if 0 //#ifndef __WXGTK__
- if (reg.IsEmpty())
+ int cw, ch;
+ m_gridWin->GetClientSize(&cw, &ch);
+ CalcUnscrolledPosition( 0, 0, &left, &top );
+ CalcUnscrolledPosition( cw, ch, &right, &bottom );
+
+ // avoid drawing grid lines past the last row and col
+ if ( m_gridLinesClipHorz )
{
- int cw, ch;
- m_gridWin->GetClientSize(&cw, &ch);
+ if ( !m_numCols )
+ return;
- // virtual coords of visible area
- //
- CalcUnscrolledPosition( 0, 0, &left, &top );
- CalcUnscrolledPosition( cw, ch, &right, &bottom );
+ const int lastColRight = GetColRight(GetColAt(m_numCols - 1));
+ if ( right > lastColRight )
+ right = lastColRight;
}
- else
+
+ if ( m_gridLinesClipVert )
{
- wxCoord x, y, w, h;
- reg.GetBox(x, y, w, h);
- CalcUnscrolledPosition( x, y, &left, &top );
- CalcUnscrolledPosition( x + w, y + h, &right, &bottom );
- }
-#else
- int cw, ch;
- m_gridWin->GetClientSize(&cw, &ch);
- CalcUnscrolledPosition( 0, 0, &left, &top );
- CalcUnscrolledPosition( cw, ch, &right, &bottom );
-#endif
+ if ( !m_numRows )
+ return;
- // avoid drawing grid lines past the last row and col
- //
- right = wxMin( right, GetColRight(GetColAt( m_numCols - 1 )) );
- bottom = wxMin( bottom, GetRowBottom(m_numRows - 1) );
+ const int lastRowBottom = GetRowBottom(m_numRows - 1);
+ if ( bottom > lastRowBottom )
+ bottom = lastRowBottom;
+ }
// no gridlines inside multicells, clip them out
int leftCol = GetColPos( internalXToCol(left) );
int rightCol = GetColPos( internalXToCol(right) );
int bottomRow = internalYToRow(bottom);
-#if !defined(__WXMAC__) || wxMAC_USE_CORE_GRAPHICS
wxRegion clippedcells(0, 0, cw, ch);
- int i, j, cell_rows, cell_cols;
+ int cell_rows, cell_cols;
wxRect rect;
- for (j=topRow; j<=bottomRow; j++)
+ for ( int j = topRow; j <= bottomRow; j++ )
{
- int colPos;
- for (colPos=leftCol; colPos<=rightCol; colPos++)
+ for ( int colPos = leftCol; colPos <= rightCol; colPos++ )
{
- i = GetColAt( colPos );
+ int i = GetColAt( colPos );
GetCellSize( j, i, &cell_rows, &cell_cols );
if ((cell_rows > 1) || (cell_cols > 1))
}
}
}
-#else
- wxRegion clippedcells( left, top, right - left, bottom - top );
-
- int i, j, cell_rows, cell_cols;
- wxRect rect;
-
- for (j=topRow; j<=bottomRow; j++)
- {
- for (i=leftCol; i<=rightCol; i++)
- {
- GetCellSize( j, i, &cell_rows, &cell_cols );
- if ((cell_rows > 1) || (cell_cols > 1))
- {
- rect = CellToRect(j, i);
- clippedcells.Subtract(rect);
- }
- else if ((cell_rows < 0) || (cell_cols < 0))
- {
- rect = CellToRect(j + cell_rows, i + cell_cols);
- clippedcells.Subtract(rect);
- }
- }
- }
-#endif
- dc.SetClippingRegion( clippedcells );
+ dc.SetDeviceClippingRegion( clippedcells );
// horizontal grid lines
- //
- // already declared above - int i;
- for ( i = internalYToRow(top); i < m_numRows; i++ )
+ for ( int i = internalYToRow(top); i < m_numRows; i++ )
{
int bot = GetRowBottom(i) - 1;
if ( bot > bottom )
- {
break;
- }
if ( bot >= top )
{
}
// vertical grid lines
- //
- int colPos;
- for ( colPos = leftCol; colPos < m_numCols; colPos++ )
+ for ( int colPos = leftCol; colPos < m_numCols; colPos++ )
{
- i = GetColAt( colPos );
+ int i = GetColAt( colPos );
int colRight = GetColRight(i);
#ifdef __WXGTK__
colRight--;
if ( colRight > right )
- {
break;
- }
if ( colRight >= left )
{
if ( !m_numRows )
return;
- size_t i;
- size_t numLabels = rows.GetCount();
-
- for ( i = 0; i < numLabels; i++ )
+ const size_t numLabels = rows.GetCount();
+ for ( size_t i = 0; i < numLabels; i++ )
{
DrawRowLabel( dc, rows[i] );
}
wxRect rect;
-#if 0
-def __WXGTK20__
- rect.SetX( 1 );
- rect.SetY( GetRowTop(row) + 1 );
- rect.SetWidth( m_rowLabelWidth - 2 );
- rect.SetHeight( GetRowHeight(row) - 2 );
-
- CalcScrolledPosition( 0, rect.y, NULL, &rect.y );
-
- wxWindowDC *win_dc = (wxWindowDC*) &dc;
-
- wxRendererNative::Get().DrawHeaderButton( win_dc->m_owner, dc, rect, 0 );
-#else
int rowTop = GetRowTop(row),
rowBottom = GetRowBottom(row) - 1;
- dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW), 1, wxSOLID) );
+ dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW)));
dc.DrawLine( m_rowLabelWidth - 1, rowTop, m_rowLabelWidth - 1, rowBottom );
dc.DrawLine( 0, rowTop, 0, rowBottom );
dc.DrawLine( 0, rowBottom, m_rowLabelWidth, rowBottom );
dc.SetPen( *wxWHITE_PEN );
dc.DrawLine( 1, rowTop, 1, rowBottom );
dc.DrawLine( 1, rowTop, m_rowLabelWidth - 1, rowTop );
-#endif
- dc.SetBackgroundMode( wxTRANSPARENT );
+ dc.SetBackgroundMode( wxBRUSHSTYLE_TRANSPARENT );
dc.SetTextForeground( GetLabelTextColour() );
dc.SetFont( GetLabelFont() );
DrawTextRectangle( dc, GetRowLabelValue( row ), rect, hAlign, vAlign );
}
+void wxGrid::UseNativeColHeader(bool native)
+{
+ if ( native == m_useNativeHeader )
+ return;
+
+ delete m_colWindow;
+ m_useNativeHeader = native;
+
+ CreateColumnWindow();
+
+ if ( m_useNativeHeader )
+ GetGridColHeader()->SetColumnCount(m_numCols);
+ CalcWindowSizes();
+}
+
+void wxGrid::SetUseNativeColLabels( bool native )
+{
+ wxASSERT_MSG( !m_useNativeHeader,
+ "doesn't make sense when using native header" );
+
+ m_nativeColumnLabels = native;
+ if (native)
+ {
+ int height = wxRendererNative::Get().GetHeaderButtonHeight( this );
+ SetColLabelSize( height );
+ }
+
+ GetColLabelWindow()->Refresh();
+ m_cornerLabelWin->Refresh();
+}
+
void wxGrid::DrawColLabels( wxDC& dc,const wxArrayInt& cols )
{
if ( !m_numCols )
return;
- size_t i;
- size_t numLabels = cols.GetCount();
-
- for ( i = 0; i < numLabels; i++ )
+ const size_t numLabels = cols.GetCount();
+ for ( size_t i = 0; i < numLabels; i++ )
{
DrawColLabel( dc, cols[i] );
}
}
-void wxGrid::DrawColLabel( wxDC& dc, int col )
+void wxGrid::DrawCornerLabel(wxDC& dc)
+{
+ if ( m_nativeColumnLabels )
+ {
+ wxRect rect(wxSize(m_rowLabelWidth, m_colLabelHeight));
+ rect.Deflate(1);
+
+ wxRendererNative::Get().DrawHeaderButton(m_cornerLabelWin, dc, rect, 0);
+ }
+ else
+ {
+ dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW)));
+ dc.DrawLine( m_rowLabelWidth - 1, m_colLabelHeight - 1,
+ m_rowLabelWidth - 1, 0 );
+ dc.DrawLine( m_rowLabelWidth - 1, m_colLabelHeight - 1,
+ 0, m_colLabelHeight - 1 );
+ dc.DrawLine( 0, 0, m_rowLabelWidth, 0 );
+ dc.DrawLine( 0, 0, 0, m_colLabelHeight );
+
+ dc.SetPen( *wxWHITE_PEN );
+ dc.DrawLine( 1, 1, m_rowLabelWidth - 1, 1 );
+ dc.DrawLine( 1, 1, 1, m_colLabelHeight - 1 );
+ }
+}
+
+void wxGrid::DrawColLabel(wxDC& dc, int col)
{
if ( GetColWidth(col) <= 0 || m_colLabelHeight <= 0 )
return;
int colLeft = GetColLeft(col);
- wxRect rect;
-
-#if 0
-def __WXGTK20__
- rect.SetX( colLeft + 1 );
- rect.SetY( 1 );
- rect.SetWidth( GetColWidth(col) - 2 );
- rect.SetHeight( m_colLabelHeight - 2 );
-
- wxWindowDC *win_dc = (wxWindowDC*) &dc;
+ wxRect rect(colLeft, 0, GetColWidth(col), m_colLabelHeight);
- wxRendererNative::Get().DrawHeaderButton( win_dc->m_owner, dc, rect, 0 );
-#else
- int colRight = GetColRight(col) - 1;
+ if ( m_nativeColumnLabels )
+ {
+ wxRendererNative::Get().DrawHeaderButton
+ (
+ GetColLabelWindow(),
+ dc,
+ rect,
+ 0,
+ IsSortingBy(col)
+ ? IsSortOrderAscending()
+ ? wxHDR_SORT_ICON_UP
+ : wxHDR_SORT_ICON_DOWN
+ : wxHDR_SORT_ICON_NONE
+ );
+ }
+ else
+ {
+ int colRight = GetColRight(col) - 1;
- dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW), 1, wxSOLID) );
- dc.DrawLine( colRight, 0, colRight, m_colLabelHeight - 1 );
- dc.DrawLine( colLeft, 0, colRight, 0 );
- dc.DrawLine( colLeft, m_colLabelHeight - 1,
- colRight + 1, m_colLabelHeight - 1 );
+ dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW)));
+ dc.DrawLine( colRight, 0,
+ colRight, m_colLabelHeight - 1 );
+ dc.DrawLine( colLeft, 0,
+ colRight, 0 );
+ dc.DrawLine( colLeft, m_colLabelHeight - 1,
+ colRight + 1, m_colLabelHeight - 1 );
- dc.SetPen( *wxWHITE_PEN );
- dc.DrawLine( colLeft, 1, colLeft, m_colLabelHeight - 1 );
- dc.DrawLine( colLeft, 1, colRight, 1 );
-#endif
+ dc.SetPen( *wxWHITE_PEN );
+ dc.DrawLine( colLeft, 1, colLeft, m_colLabelHeight - 1 );
+ dc.DrawLine( colLeft, 1, colRight, 1 );
+ }
- dc.SetBackgroundMode( wxTRANSPARENT );
+ dc.SetBackgroundMode( wxBRUSHSTYLE_TRANSPARENT );
dc.SetTextForeground( GetLabelTextColour() );
dc.SetFont( GetLabelFont() );
- int hAlign, vAlign, orient;
+ int hAlign, vAlign;
GetColLabelAlignment( &hAlign, &vAlign );
- orient = GetColLabelTextOrientation();
+ const int orient = GetColLabelTextOrientation();
- rect.SetX( colLeft + 2 );
- rect.SetY( 2 );
- rect.SetWidth( GetColWidth(col) - 4 );
- rect.SetHeight( m_colLabelHeight - 4 );
- DrawTextRectangle( dc, GetColLabelValue( col ), rect, hAlign, vAlign, orient );
+ rect.Deflate(2);
+ DrawTextRectangle(dc, GetColLabelValue(col), rect, hAlign, vAlign, orient);
}
+// TODO: these 2 functions should be replaced with wxDC::DrawLabel() to which
+// we just have to add textOrientation support
void wxGrid::DrawTextRectangle( wxDC& dc,
const wxString& value,
const wxRect& rect,
StringToLines( value, lines );
- // Forward to new API.
- DrawTextRectangle( dc,
- lines,
- rect,
- horizAlign,
- vertAlign,
- textOrientation );
+ DrawTextRectangle(dc, lines, rect, horizAlign, vertAlign, textOrientation);
}
-// VZ: this should be replaced with wxDC::DrawLabel() to which we just have to
-// add textOrientation support
void wxGrid::DrawTextRectangle(wxDC& dc,
const wxArrayString& lines,
const wxRect& rect,
continue;
}
- long lineWidth = 0,
+ wxCoord lineWidth = 0,
lineHeight = 0;
dc.GetTextExtent(line, &lineWidth, &lineHeight);
// Split multi-line text up into an array of strings.
// Any existing contents of the string array are preserved.
//
-void wxGrid::StringToLines( const wxString& value, wxArrayString& lines )
+// TODO: refactor wxTextFile::Read() and reuse the same code from here
+void wxGrid::StringToLines( const wxString& value, wxArrayString& lines ) const
{
int startPos = 0;
int pos;
}
else
{
- lines.Add( value.Mid(startPos, pos) );
+ lines.Add( tVal.Mid(startPos, pos) );
}
startPos += pos + 1;
}
- if ( startPos < (int)value.length() )
+ if ( startPos < (int)tVal.length() )
{
- lines.Add( value.Mid( startPos ) );
+ lines.Add( tVal.Mid( startPos ) );
}
}
void wxGrid::GetTextBoxSize( const wxDC& dc,
const wxArrayString& lines,
- long *width, long *height )
+ long *width, long *height ) const
{
- long w = 0;
- long h = 0;
- long lineW = 0, lineH = 0;
+ wxCoord w = 0;
+ wxCoord h = 0;
+ wxCoord lineW = 0, lineH = 0;
size_t i;
for ( i = 0; i < lines.GetCount(); i++ )
{
CalcDimensions();
m_rowLabelWin->Refresh();
- m_colLabelWin->Refresh();
+ m_colWindow->Refresh();
m_cornerLabelWin->Refresh();
m_gridWin->Refresh();
}
void wxGrid::EnableEditing( bool edit )
{
- // TODO: improve this ?
- //
if ( edit != m_editable )
{
if (!edit)
{
if ( enable )
{
- if (SendEvent( wxEVT_GRID_EDITOR_SHOWN) <0)
+ if ( SendEvent(wxEVT_GRID_EDITOR_SHOWN) == -1 )
return;
// this should be checked by the caller!
}
else
{
- //FIXME:add veto support
- SendEvent( wxEVT_GRID_EDITOR_HIDDEN );
+ SendEvent(wxEVT_GRID_EDITOR_HIDDEN);
HideCellEditControl();
SaveEditControlValue();
// might not cover the entire cell
wxClientDC dc( m_gridWin );
PrepareDC( dc );
- dc.SetBrush(wxBrush(GetCellAttr(row, col)->GetBackgroundColour(), wxSOLID));
+ wxGridCellAttr* attr = GetCellAttr(row, col);
+ dc.SetBrush(wxBrush(attr->GetBackgroundColour()));
dc.SetPen(*wxTRANSPARENT_PEN);
dc.DrawRectangle(rect);
if (rect.y > 0)
rect.y--;
- wxGridCellAttr* attr = GetCellAttr(row, col);
wxGridCellEditor* editor = attr->GetEditor(this, row, col);
if ( !editor->IsCreated() )
{
wxGridCellAttr *attr = GetCellAttr(row, col);
wxGridCellEditor *editor = attr->GetEditor(this, row, col);
+ const bool editorHadFocus = editor->GetControl()->HasFocus();
editor->Show( false );
editor->DecRef();
attr->DecRef();
- m_gridWin->SetFocus();
+ // return the focus to the grid itself if the editor had it
+ //
+ // note that we must not do this unconditionally to avoid stealing
+ // focus from the window which just received it if we are hiding the
+ // editor precisely because we lost focus
+ if ( editorHadFocus )
+ m_gridWin->SetFocus();
// refresh whole row to the right
wxRect rect( CellToRect(row, col) );
wxGridCellAttr* attr = GetCellAttr(row, col);
wxGridCellEditor* editor = attr->GetEditor(this, row, col);
- bool changed = editor->EndEdit(row, col, this);
- editor->DecRef();
- attr->DecRef();
+ wxString newval;
+ bool changed = editor->EndEdit(oldval, &newval);
- if (changed)
+ if ( changed && SendEvent(wxEVT_GRID_CELL_CHANGING, newval) != -1 )
{
- if ( SendEvent( wxEVT_GRID_CELL_CHANGE,
- m_currentCellCoords.GetRow(),
- m_currentCellCoords.GetCol() ) < 0 )
+ editor->ApplyEdit(row, col, this);
+
+ // for compatibility reasons dating back to wx 2.8 when this event
+ // was called wxEVT_GRID_CELL_CHANGE and wxEVT_GRID_CELL_CHANGING
+ // didn't exist we allow vetoing this one too
+ if ( SendEvent(wxEVT_GRID_CELL_CHANGED, oldval) == -1 )
{
// Event has been vetoed, set the data back.
SetCellValue(row, col, oldval);
}
}
+
+ editor->DecRef();
+ attr->DecRef();
}
}
// coordinates for mouse events etc.
//
-void wxGrid::XYToCell( int x, int y, wxGridCellCoords& coords )
+wxGridCellCoords wxGrid::XYToCell(int x, int y) const
{
int row = YToRow(y);
int col = XToCol(x);
- if ( row == -1 || col == -1 )
- {
- coords = wxGridNoCellCoords;
- }
- else
- {
- coords.Set( row, col );
- }
+ return row == -1 || col == -1 ? wxGridNoCellCoords
+ : wxGridCellCoords(row, col);
}
-// Internal Helper function for computing row or column from some
-// (unscrolled) coordinate value, using either
-// m_defaultRowHeight/m_defaultColWidth or binary search on array
-// of m_rowBottoms/m_ColRights to speed up the search!
-
-static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
- const wxArrayInt& BorderArray, int nMax,
- bool clipToMinMax)
+// compute row or column from some (unscrolled) coordinate value, using either
+// m_defaultRowHeight/m_defaultColWidth or binary search on array of
+// m_rowBottoms/m_colRights to do it quickly (linear search shouldn't be used
+// for large grids)
+int wxGrid::PosToLinePos(int coord,
+ bool clipToMinMax,
+ const wxGridOperations& oper) const
{
- if (coord < 0)
- return clipToMinMax && (nMax > 0) ? 0 : -1;
-
- if (!defaultDist)
- defaultDist = 1;
-
- size_t i_max = coord / defaultDist,
- i_min = 0;
-
- if (BorderArray.IsEmpty())
- {
- if ((int) i_max < nMax)
- return i_max;
- return clipToMinMax ? nMax - 1 : -1;
- }
-
- if ( i_max >= BorderArray.GetCount())
- {
- i_max = BorderArray.GetCount() - 1;
- }
- else
- {
- if ( coord >= BorderArray[i_max])
- {
- i_min = i_max;
- if (minDist)
- i_max = coord / minDist;
- else
- i_max = BorderArray.GetCount() - 1;
- }
-
- if ( i_max >= BorderArray.GetCount())
- i_max = BorderArray.GetCount() - 1;
- }
-
- if ( coord >= BorderArray[i_max])
- return clipToMinMax ? (int)i_max : -1;
- if ( coord < BorderArray[0] )
- return 0;
+ const int numLines = oper.GetNumberOfLines(this);
- while ( i_max - i_min > 0 )
- {
- wxCHECK_MSG(BorderArray[i_min] <= coord && coord < BorderArray[i_max],
- 0, _T("wxGrid: internal error in CoordToRowOrCol"));
- if (coord >= BorderArray[ i_max - 1])
- return i_max;
- else
- i_max--;
- int median = i_min + (i_max - i_min + 1) / 2;
- if (coord < BorderArray[median])
- i_max = median;
- else
- i_min = median;
- }
+ if ( coord < 0 )
+ return clipToMinMax && numLines > 0 ? 0 : wxNOT_FOUND;
- return i_max;
-}
+ const int defaultLineSize = oper.GetDefaultLineSize(this);
+ wxCHECK_MSG( defaultLineSize, -1, "can't have 0 default line size" );
-int wxGrid::YToRow( int y )
-{
- return CoordToRowOrCol(y, m_defaultRowHeight,
- m_minAcceptableRowHeight, m_rowBottoms, m_numRows, false);
-}
+ int maxPos = coord / defaultLineSize,
+ minPos = 0;
-int wxGrid::XToCol( int x, bool clipToMinMax )
-{
- if (x < 0)
- return clipToMinMax && (m_numCols > 0) ? GetColAt( 0 ) : -1;
+ // check for the simplest case: if we have no explicit line sizes
+ // configured, then we already know the line this position falls in
+ const wxArrayInt& lineEnds = oper.GetLineEnds(this);
+ if ( lineEnds.empty() )
+ {
+ if ( maxPos < numLines )
+ return maxPos;
- if (!m_defaultColWidth)
- m_defaultColWidth = 1;
+ return clipToMinMax ? numLines - 1 : -1;
+ }
- int maxPos = x / m_defaultColWidth;
- int minPos = 0;
- if (m_colRights.IsEmpty())
+ // adjust maxPos before starting the binary search
+ if ( maxPos >= numLines )
{
- if(maxPos < m_numCols)
- return GetColAt( maxPos );
- return clipToMinMax ? GetColAt( m_numCols - 1 ) : -1;
+ maxPos = numLines - 1;
}
-
- if ( maxPos >= m_numCols)
- maxPos = m_numCols - 1;
else
{
- if ( x >= m_colRights[GetColAt( maxPos )])
+ if ( coord >= lineEnds[oper.GetLineAt(this, maxPos)])
{
minPos = maxPos;
- if (m_minAcceptableColWidth)
- maxPos = x / m_minAcceptableColWidth;
+ const int minDist = oper.GetMinimalAcceptableLineSize(this);
+ if ( minDist )
+ maxPos = coord / minDist;
else
- maxPos = m_numCols - 1;
+ maxPos = numLines - 1;
}
- if ( maxPos >= m_numCols)
- maxPos = m_numCols - 1;
+
+ if ( maxPos >= numLines )
+ maxPos = numLines - 1;
}
- //X is beyond the last column
- if ( x >= m_colRights[GetColAt( maxPos )])
- return clipToMinMax ? GetColAt( maxPos ) : -1;
+ // check if the position is beyond the last column
+ const int lineAtMaxPos = oper.GetLineAt(this, maxPos);
+ if ( coord >= lineEnds[lineAtMaxPos] )
+ return clipToMinMax ? maxPos : -1;
+
+ // or before the first one
+ const int lineAt0 = oper.GetLineAt(this, 0);
+ if ( coord < lineEnds[lineAt0] )
+ return 0;
- //X is before the first column
- if ( x < m_colRights[GetColAt( 0 )] )
- return GetColAt( 0 );
- //Perform a binary search
- while ( maxPos - minPos > 0 )
+ // finally do perform the binary search
+ while ( minPos < maxPos )
{
- wxCHECK_MSG(m_colRights[GetColAt( minPos )] <= x && x < m_colRights[GetColAt( maxPos )],
- 0, _T("wxGrid: internal error in XToCol"));
+ wxCHECK_MSG( lineEnds[oper.GetLineAt(this, minPos)] <= coord &&
+ coord < lineEnds[oper.GetLineAt(this, maxPos)],
+ -1,
+ "wxGrid: internal error in PosToLinePos()" );
- if (x >= m_colRights[GetColAt( maxPos - 1 )])
- return GetColAt( maxPos );
+ if ( coord >= lineEnds[oper.GetLineAt(this, maxPos - 1)] )
+ return maxPos;
else
maxPos--;
- int median = minPos + (maxPos - minPos + 1) / 2;
- if (x < m_colRights[GetColAt( median )])
+
+ const int median = minPos + (maxPos - minPos + 1) / 2;
+ if ( coord < lineEnds[oper.GetLineAt(this, median)] )
maxPos = median;
else
minPos = median;
}
- return GetColAt( maxPos );
+
+ return maxPos;
+}
+
+int
+wxGrid::PosToLine(int coord,
+ bool clipToMinMax,
+ const wxGridOperations& oper) const
+{
+ int pos = PosToLinePos(coord, clipToMinMax, oper);
+
+ return pos == wxNOT_FOUND ? wxNOT_FOUND : oper.GetLineAt(this, pos);
+}
+
+int wxGrid::YToRow(int y, bool clipToMinMax) const
+{
+ return PosToLine(y, clipToMinMax, wxGridRowOperations());
+}
+
+int wxGrid::XToCol(int x, bool clipToMinMax) const
+{
+ return PosToLine(x, clipToMinMax, wxGridColumnOperations());
+}
+
+int wxGrid::XToPos(int x) const
+{
+ return PosToLinePos(x, true /* clip */, wxGridColumnOperations());
}
-// return the row number that that the y coord is near
-// the edge of, or -1 if not near an edge.
+// return the row number that that the y coord is near the edge of, or -1 if
+// not near an edge.
+//
// coords can only possibly be near an edge if
// (a) the row/column is large enough to still allow for an "inner" area
-// that is _not_ nead the edge (i.e., if the height/width is smaller
+// that is _not_ near the edge (i.e., if the height/width is smaller
// than WXGRID_LABEL_EDGE_ZONE, coords are _never_ considered to be
// near the edge).
// and
// (b) resizing rows/columns (the thing for which edge detection is
// relevant at all) is enabled.
//
-int wxGrid::YToEdgeOfRow( int y )
+int wxGrid::PosToEdgeOfLine(int pos, const wxGridOperations& oper) const
{
- int i;
- i = internalYToRow(y);
+ if ( !oper.CanResizeLines(this) )
+ return -1;
- if ( GetRowHeight(i) > WXGRID_LABEL_EDGE_ZONE && CanDragRowSize() )
+ const int line = oper.PosToLine(this, pos, true);
+
+ if ( oper.GetLineSize(this, line) > WXGRID_LABEL_EDGE_ZONE )
{
- // We know that we are in row i, test whether we are
- // close enough to lower or upper border, respectively.
- if ( abs(GetRowBottom(i) - y) < WXGRID_LABEL_EDGE_ZONE )
- return i;
- else if ( i > 0 && y - GetRowTop(i) < WXGRID_LABEL_EDGE_ZONE )
- return i - 1;
+ // We know that we are in this line, test whether we are close enough
+ // to start or end border, respectively.
+ if ( abs(oper.GetLineEndPos(this, line) - pos) < WXGRID_LABEL_EDGE_ZONE )
+ return line;
+ else if ( line > 0 &&
+ pos - oper.GetLineStartPos(this,
+ line) < WXGRID_LABEL_EDGE_ZONE )
+ return line - 1;
}
return -1;
}
-// return the col number that that the x coord is near the edge of, or
-// -1 if not near an edge
-// See comment at YToEdgeOfRow for conditions on edge detection.
-//
-int wxGrid::XToEdgeOfCol( int x )
+int wxGrid::YToEdgeOfRow(int y) const
{
- int i;
- i = internalXToCol(x);
-
- if ( GetColWidth(i) > WXGRID_LABEL_EDGE_ZONE && CanDragColSize() )
- {
- // We know that we are in column i; test whether we are
- // close enough to right or left border, respectively.
- if ( abs(GetColRight(i) - x) < WXGRID_LABEL_EDGE_ZONE )
- return i;
- else if ( i > 0 && x - GetColLeft(i) < WXGRID_LABEL_EDGE_ZONE )
- return i - 1;
- }
+ return PosToEdgeOfLine(y, wxGridRowOperations());
+}
- return -1;
+int wxGrid::XToEdgeOfCol(int x) const
+{
+ return PosToEdgeOfLine(x, wxGridColumnOperations());
}
-wxRect wxGrid::CellToRect( int row, int col )
+wxRect wxGrid::CellToRect( int row, int col ) const
{
wxRect rect( -1, -1, -1, -1 );
return rect;
}
-bool wxGrid::IsVisible( int row, int col, bool wholeCellVisible )
+bool wxGrid::IsVisible( int row, int col, bool wholeCellVisible ) const
{
// get the cell rectangle in logical coords
//
// ------ Grid cursor movement functions
//
-bool wxGrid::MoveCursorUp( bool expandSelection )
+bool
+wxGrid::DoMoveCursor(bool expandSelection,
+ const wxGridDirectionOperations& diroper)
{
- if ( m_currentCellCoords != wxGridNoCellCoords &&
- m_currentCellCoords.GetRow() >= 0 )
- {
- if ( expandSelection )
- {
- if ( m_selectingKeyboard == wxGridNoCellCoords )
- m_selectingKeyboard = m_currentCellCoords;
- if ( m_selectingKeyboard.GetRow() > 0 )
- {
- m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() - 1 );
- MakeCellVisible( m_selectingKeyboard.GetRow(),
- m_selectingKeyboard.GetCol() );
- HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
- }
- }
- else if ( m_currentCellCoords.GetRow() > 0 )
- {
- int row = m_currentCellCoords.GetRow() - 1;
- int col = m_currentCellCoords.GetCol();
- ClearSelection();
- MakeCellVisible( row, col );
- SetCurrentCell( row, col );
- }
- else
- return false;
-
- return true;
- }
-
- return false;
-}
+ if ( m_currentCellCoords == wxGridNoCellCoords )
+ return false;
-bool wxGrid::MoveCursorDown( bool expandSelection )
-{
- if ( m_currentCellCoords != wxGridNoCellCoords &&
- m_currentCellCoords.GetRow() < m_numRows )
+ if ( expandSelection )
{
- if ( expandSelection )
- {
- if ( m_selectingKeyboard == wxGridNoCellCoords )
- m_selectingKeyboard = m_currentCellCoords;
- if ( m_selectingKeyboard.GetRow() < m_numRows - 1 )
- {
- m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() + 1 );
- MakeCellVisible( m_selectingKeyboard.GetRow(),
- m_selectingKeyboard.GetCol() );
- HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
- }
- }
- else if ( m_currentCellCoords.GetRow() < m_numRows - 1 )
- {
- int row = m_currentCellCoords.GetRow() + 1;
- int col = m_currentCellCoords.GetCol();
- ClearSelection();
- MakeCellVisible( row, col );
- SetCurrentCell( row, col );
- }
- else
- return false;
+ wxGridCellCoords coords = m_selectedBlockCorner;
+ if ( coords == wxGridNoCellCoords )
+ coords = m_currentCellCoords;
- return true;
- }
+ if ( diroper.IsAtBoundary(coords) )
+ return false;
- return false;
-}
+ diroper.Advance(coords);
-bool wxGrid::MoveCursorLeft( bool expandSelection )
-{
- if ( m_currentCellCoords != wxGridNoCellCoords &&
- m_currentCellCoords.GetCol() >= 0 )
+ UpdateBlockBeingSelected(m_currentCellCoords, coords);
+ }
+ else // don't expand selection
{
- if ( expandSelection )
- {
- if ( m_selectingKeyboard == wxGridNoCellCoords )
- m_selectingKeyboard = m_currentCellCoords;
- if ( m_selectingKeyboard.GetCol() > 0 )
- {
- m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() - 1 );
- MakeCellVisible( m_selectingKeyboard.GetRow(),
- m_selectingKeyboard.GetCol() );
- HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
- }
- }
- else if ( GetColPos( m_currentCellCoords.GetCol() ) > 0 )
- {
- int row = m_currentCellCoords.GetRow();
- int col = GetColAt( GetColPos( m_currentCellCoords.GetCol() ) - 1 );
- ClearSelection();
+ ClearSelection();
- MakeCellVisible( row, col );
- SetCurrentCell( row, col );
- }
- else
+ if ( diroper.IsAtBoundary(m_currentCellCoords) )
return false;
- return true;
+ wxGridCellCoords coords = m_currentCellCoords;
+ diroper.Advance(coords);
+
+ GoToCell(coords);
}
- return false;
+ return true;
}
-bool wxGrid::MoveCursorRight( bool expandSelection )
+bool wxGrid::MoveCursorUp(bool expandSelection)
{
- if ( m_currentCellCoords != wxGridNoCellCoords &&
- m_currentCellCoords.GetCol() < m_numCols )
- {
- if ( expandSelection )
- {
- if ( m_selectingKeyboard == wxGridNoCellCoords )
- m_selectingKeyboard = m_currentCellCoords;
- if ( m_selectingKeyboard.GetCol() < m_numCols - 1 )
- {
- m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() + 1 );
- MakeCellVisible( m_selectingKeyboard.GetRow(),
- m_selectingKeyboard.GetCol() );
- HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
- }
- }
- else if ( GetColPos( m_currentCellCoords.GetCol() ) < m_numCols - 1 )
- {
- int row = m_currentCellCoords.GetRow();
- int col = GetColAt( GetColPos( m_currentCellCoords.GetCol() ) + 1 );
- ClearSelection();
-
- MakeCellVisible( row, col );
- SetCurrentCell( row, col );
- }
- else
- return false;
-
- return true;
- }
-
- return false;
+ return DoMoveCursor(expandSelection,
+ wxGridBackwardOperations(this, wxGridRowOperations()));
}
-bool wxGrid::MovePageUp()
+bool wxGrid::MoveCursorDown(bool expandSelection)
{
- if ( m_currentCellCoords == wxGridNoCellCoords )
- return false;
-
- int row = m_currentCellCoords.GetRow();
- if ( row > 0 )
- {
- int cw, ch;
- m_gridWin->GetClientSize( &cw, &ch );
-
- int y = GetRowTop(row);
- int newRow = internalYToRow( y - ch + 1 );
-
- if ( newRow == row )
- {
- // row > 0, so newRow can never be less than 0 here.
- newRow = row - 1;
- }
-
- MakeCellVisible( newRow, m_currentCellCoords.GetCol() );
- SetCurrentCell( newRow, m_currentCellCoords.GetCol() );
+ return DoMoveCursor(expandSelection,
+ wxGridForwardOperations(this, wxGridRowOperations()));
+}
- return true;
- }
+bool wxGrid::MoveCursorLeft(bool expandSelection)
+{
+ return DoMoveCursor(expandSelection,
+ wxGridBackwardOperations(this, wxGridColumnOperations()));
+}
- return false;
+bool wxGrid::MoveCursorRight(bool expandSelection)
+{
+ return DoMoveCursor(expandSelection,
+ wxGridForwardOperations(this, wxGridColumnOperations()));
}
-bool wxGrid::MovePageDown()
+bool wxGrid::DoMoveCursorByPage(const wxGridDirectionOperations& diroper)
{
if ( m_currentCellCoords == wxGridNoCellCoords )
return false;
- int row = m_currentCellCoords.GetRow();
- if ( (row + 1) < m_numRows )
- {
- int cw, ch;
- m_gridWin->GetClientSize( &cw, &ch );
-
- int y = GetRowTop(row);
- int newRow = internalYToRow( y + ch );
- if ( newRow == row )
- {
- // row < m_numRows, so newRow can't overflow here.
- newRow = row + 1;
- }
-
- MakeCellVisible( newRow, m_currentCellCoords.GetCol() );
- SetCurrentCell( newRow, m_currentCellCoords.GetCol() );
+ if ( diroper.IsAtBoundary(m_currentCellCoords) )
+ return false;
- return true;
+ const int oldRow = m_currentCellCoords.GetRow();
+ int newRow = diroper.MoveByPixelDistance(oldRow, m_gridWin->GetClientSize().y);
+ if ( newRow == oldRow )
+ {
+ wxGridCellCoords coords(m_currentCellCoords);
+ diroper.Advance(coords);
+ newRow = coords.GetRow();
}
- return false;
+ GoToCell(newRow, m_currentCellCoords.GetCol());
+
+ return true;
}
-bool wxGrid::MoveCursorUpBlock( bool expandSelection )
+bool wxGrid::MovePageUp()
{
- if ( m_table &&
- m_currentCellCoords != wxGridNoCellCoords &&
- m_currentCellCoords.GetRow() > 0 )
- {
- int row = m_currentCellCoords.GetRow();
- int col = m_currentCellCoords.GetCol();
-
- if ( m_table->IsEmptyCell(row, col) )
- {
- // starting in an empty cell: find the next block of
- // non-empty cells
- //
- while ( row > 0 )
- {
- row--;
- if ( !(m_table->IsEmptyCell(row, col)) )
- break;
- }
- }
- else if ( m_table->IsEmptyCell(row - 1, col) )
- {
- // starting at the top of a block: find the next block
- //
- row--;
- while ( row > 0 )
- {
- row--;
- if ( !(m_table->IsEmptyCell(row, col)) )
- break;
- }
- }
- else
- {
- // starting within a block: find the top of the block
- //
- while ( row > 0 )
- {
- row--;
- if ( m_table->IsEmptyCell(row, col) )
- {
- row++;
- break;
- }
- }
- }
-
- MakeCellVisible( row, col );
- if ( expandSelection )
- {
- m_selectingKeyboard = wxGridCellCoords( row, col );
- HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
- }
- else
- {
- ClearSelection();
- SetCurrentCell( row, col );
- }
-
- return true;
- }
-
- return false;
+ return DoMoveCursorByPage(
+ wxGridBackwardOperations(this, wxGridRowOperations()));
}
-bool wxGrid::MoveCursorDownBlock( bool expandSelection )
+bool wxGrid::MovePageDown()
{
- if ( m_table &&
- m_currentCellCoords != wxGridNoCellCoords &&
- m_currentCellCoords.GetRow() < m_numRows - 1 )
- {
- int row = m_currentCellCoords.GetRow();
- int col = m_currentCellCoords.GetCol();
-
- if ( m_table->IsEmptyCell(row, col) )
- {
- // starting in an empty cell: find the next block of
- // non-empty cells
- //
- while ( row < m_numRows - 1 )
- {
- row++;
- if ( !(m_table->IsEmptyCell(row, col)) )
- break;
- }
- }
- else if ( m_table->IsEmptyCell(row + 1, col) )
- {
- // starting at the bottom of a block: find the next block
- //
- row++;
- while ( row < m_numRows - 1 )
- {
- row++;
- if ( !(m_table->IsEmptyCell(row, col)) )
- break;
- }
- }
- else
- {
- // starting within a block: find the bottom of the block
- //
- while ( row < m_numRows - 1 )
- {
- row++;
- if ( m_table->IsEmptyCell(row, col) )
- {
- row--;
- break;
- }
- }
- }
-
- MakeCellVisible( row, col );
- if ( expandSelection )
- {
- m_selectingKeyboard = wxGridCellCoords( row, col );
- HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
- }
- else
- {
- ClearSelection();
- SetCurrentCell( row, col );
- }
-
- return true;
- }
-
- return false;
+ return DoMoveCursorByPage(
+ wxGridForwardOperations(this, wxGridRowOperations()));
}
-bool wxGrid::MoveCursorLeftBlock( bool expandSelection )
+// helper of DoMoveCursorByBlock(): advance the cell coordinates using diroper
+// until we find a non-empty cell or reach the grid end
+void
+wxGrid::AdvanceToNextNonEmpty(wxGridCellCoords& coords,
+ const wxGridDirectionOperations& diroper)
{
- if ( m_table &&
- m_currentCellCoords != wxGridNoCellCoords &&
- m_currentCellCoords.GetCol() > 0 )
+ while ( !diroper.IsAtBoundary(coords) )
{
- int row = m_currentCellCoords.GetRow();
- int col = m_currentCellCoords.GetCol();
-
- if ( m_table->IsEmptyCell(row, col) )
- {
- // starting in an empty cell: find the next block of
- // non-empty cells
- //
- while ( col > 0 )
- {
- col--;
- if ( !(m_table->IsEmptyCell(row, col)) )
- break;
- }
- }
- else if ( m_table->IsEmptyCell(row, col - 1) )
- {
- // starting at the left of a block: find the next block
- //
- col--;
- while ( col > 0 )
- {
- col--;
- if ( !(m_table->IsEmptyCell(row, col)) )
- break;
- }
- }
- else
- {
- // starting within a block: find the left of the block
- //
- while ( col > 0 )
- {
- col--;
- if ( m_table->IsEmptyCell(row, col) )
- {
- col++;
- break;
- }
- }
- }
-
- MakeCellVisible( row, col );
- if ( expandSelection )
- {
- m_selectingKeyboard = wxGridCellCoords( row, col );
- HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
- }
- else
- {
- ClearSelection();
- SetCurrentCell( row, col );
- }
-
- return true;
+ diroper.Advance(coords);
+ if ( !m_table->IsEmpty(coords) )
+ break;
}
-
- return false;
}
-bool wxGrid::MoveCursorRightBlock( bool expandSelection )
+bool
+wxGrid::DoMoveCursorByBlock(bool expandSelection,
+ const wxGridDirectionOperations& diroper)
{
- if ( m_table &&
- m_currentCellCoords != wxGridNoCellCoords &&
- m_currentCellCoords.GetCol() < m_numCols - 1 )
- {
- int row = m_currentCellCoords.GetRow();
- int col = m_currentCellCoords.GetCol();
+ if ( !m_table || m_currentCellCoords == wxGridNoCellCoords )
+ return false;
- if ( m_table->IsEmptyCell(row, col) )
- {
- // starting in an empty cell: find the next block of
- // non-empty cells
- //
- while ( col < m_numCols - 1 )
- {
- col++;
- if ( !(m_table->IsEmptyCell(row, col)) )
- break;
- }
- }
- else if ( m_table->IsEmptyCell(row, col + 1) )
+ if ( diroper.IsAtBoundary(m_currentCellCoords) )
+ return false;
+
+ wxGridCellCoords coords(m_currentCellCoords);
+ if ( m_table->IsEmpty(coords) )
+ {
+ // we are in an empty cell: find the next block of non-empty cells
+ AdvanceToNextNonEmpty(coords, diroper);
+ }
+ else // current cell is not empty
+ {
+ diroper.Advance(coords);
+ if ( m_table->IsEmpty(coords) )
{
- // starting at the right of a block: find the next block
- //
- col++;
- while ( col < m_numCols - 1 )
- {
- col++;
- if ( !(m_table->IsEmptyCell(row, col)) )
- break;
- }
+ // we started at the end of a block, find the next one
+ AdvanceToNextNonEmpty(coords, diroper);
}
- else
+ else // we're in a middle of a block
{
- // starting within a block: find the right of the block
- //
- while ( col < m_numCols - 1 )
+ // go to the end of it, i.e. find the last cell before the next
+ // empty one
+ while ( !diroper.IsAtBoundary(coords) )
{
- col++;
- if ( m_table->IsEmptyCell(row, col) )
- {
- col--;
+ wxGridCellCoords coordsNext(coords);
+ diroper.Advance(coordsNext);
+ if ( m_table->IsEmpty(coordsNext) )
break;
- }
- }
- }
- MakeCellVisible( row, col );
- if ( expandSelection )
- {
- m_selectingKeyboard = wxGridCellCoords( row, col );
- HighlightBlock( m_currentCellCoords, m_selectingKeyboard );
- }
- else
- {
- ClearSelection();
- SetCurrentCell( row, col );
+ coords = coordsNext;
+ }
}
+ }
- return true;
+ if ( expandSelection )
+ {
+ UpdateBlockBeingSelected(m_currentCellCoords, coords);
+ }
+ else
+ {
+ ClearSelection();
+ GoToCell(coords);
}
- return false;
+ return true;
+}
+
+bool wxGrid::MoveCursorUpBlock(bool expandSelection)
+{
+ return DoMoveCursorByBlock(
+ expandSelection,
+ wxGridBackwardOperations(this, wxGridRowOperations())
+ );
+}
+
+bool wxGrid::MoveCursorDownBlock( bool expandSelection )
+{
+ return DoMoveCursorByBlock(
+ expandSelection,
+ wxGridForwardOperations(this, wxGridRowOperations())
+ );
+}
+
+bool wxGrid::MoveCursorLeftBlock( bool expandSelection )
+{
+ return DoMoveCursorByBlock(
+ expandSelection,
+ wxGridBackwardOperations(this, wxGridColumnOperations())
+ );
+}
+
+bool wxGrid::MoveCursorRightBlock( bool expandSelection )
+{
+ return DoMoveCursorByBlock(
+ expandSelection,
+ wxGridForwardOperations(this, wxGridColumnOperations())
+ );
}
//
// ------ Label values and formatting
//
-void wxGrid::GetRowLabelAlignment( int *horiz, int *vert )
+void wxGrid::GetRowLabelAlignment( int *horiz, int *vert ) const
{
if ( horiz )
*horiz = m_rowLabelHorizAlign;
*vert = m_rowLabelVertAlign;
}
-void wxGrid::GetColLabelAlignment( int *horiz, int *vert )
+void wxGrid::GetColLabelAlignment( int *horiz, int *vert ) const
{
if ( horiz )
*horiz = m_colLabelHorizAlign;
*vert = m_colLabelVertAlign;
}
-int wxGrid::GetColLabelTextOrientation()
+int wxGrid::GetColLabelTextOrientation() const
{
return m_colLabelTextOrientation;
}
-wxString wxGrid::GetRowLabelValue( int row )
+wxString wxGrid::GetRowLabelValue( int row ) const
{
if ( m_table )
{
}
}
-wxString wxGrid::GetColLabelValue( int col )
+wxString wxGrid::GetColLabelValue( int col ) const
{
if ( m_table )
{
void wxGrid::SetRowLabelSize( int width )
{
- width = wxMax( width, 0 );
+ wxASSERT( width >= 0 || width == wxGRID_AUTOSIZE );
+
+ if ( width == wxGRID_AUTOSIZE )
+ {
+ width = CalcColOrRowLabelAreaMinSize(wxGRID_ROW);
+ }
+
if ( width != m_rowLabelWidth )
{
if ( width == 0 )
void wxGrid::SetColLabelSize( int height )
{
- height = wxMax( height, 0 );
+ wxASSERT( height >=0 || height == wxGRID_AUTOSIZE );
+
+ if ( height == wxGRID_AUTOSIZE )
+ {
+ height = CalcColOrRowLabelAreaMinSize(wxGRID_COLUMN);
+ }
+
if ( height != m_colLabelHeight )
{
if ( height == 0 )
{
- m_colLabelWin->Show( false );
+ m_colWindow->Show( false );
m_cornerLabelWin->Show( false );
}
else if ( m_colLabelHeight == 0 )
{
- m_colLabelWin->Show( true );
+ m_colWindow->Show( true );
if ( m_rowLabelWidth > 0 )
m_cornerLabelWin->Show( true );
}
{
m_labelBackgroundColour = colour;
m_rowLabelWin->SetBackgroundColour( colour );
- m_colLabelWin->SetBackgroundColour( colour );
+ m_colWindow->SetBackgroundColour( colour );
m_cornerLabelWin->SetBackgroundColour( colour );
if ( !GetBatchCount() )
{
m_rowLabelWin->Refresh();
- m_colLabelWin->Refresh();
+ m_colWindow->Refresh();
m_cornerLabelWin->Refresh();
}
}
if ( !GetBatchCount() )
{
m_rowLabelWin->Refresh();
- m_colLabelWin->Refresh();
+ m_colWindow->Refresh();
}
}
}
if ( !GetBatchCount() )
{
m_rowLabelWin->Refresh();
- m_colLabelWin->Refresh();
+ m_colWindow->Refresh();
}
}
if ( !GetBatchCount() )
{
- m_colLabelWin->Refresh();
+ m_colWindow->Refresh();
}
}
m_colLabelTextOrientation = textOrientation;
if ( !GetBatchCount() )
- m_colLabelWin->Refresh();
+ m_colWindow->Refresh();
}
void wxGrid::SetRowLabelValue( int row, const wxString& s )
m_table->SetColLabelValue( col, s );
if ( !GetBatchCount() )
{
- wxRect rect = CellToRect( 0, col );
- if ( rect.width > 0 )
+ if ( m_useNativeHeader )
{
- CalcScrolledPosition(rect.x, 0, &rect.x, &rect.y);
- rect.y = 0;
- rect.height = m_colLabelHeight;
- m_colLabelWin->Refresh( true, &rect );
+ GetGridColHeader()->UpdateColumn(col);
+ }
+ else
+ {
+ wxRect rect = CellToRect( 0, col );
+ if ( rect.width > 0 )
+ {
+ CalcScrolledPosition(rect.x, 0, &rect.x, &rect.y);
+ rect.y = 0;
+ rect.height = m_colLabelHeight;
+ GetColLabelWindow()->Refresh( true, &rect );
+ }
}
}
}
{
m_gridLineColour = colour;
- wxClientDC dc( m_gridWin );
- PrepareDC( dc );
- DrawAllGridLines( dc, wxRegion() );
+ if ( GridLinesEnabled() )
+ RedrawGridLines();
}
}
// make any visible change if the the thickness is getting smaller.
int row = m_currentCellCoords.GetRow();
int col = m_currentCellCoords.GetCol();
- if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
+ if ( row == -1 || col == -1 || GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
return;
wxRect rect = CellToRect(row, col);
// make any visible change if the the thickness is getting smaller.
int row = m_currentCellCoords.GetRow();
int col = m_currentCellCoords.GetCol();
- if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
+ if ( row == -1 || col == -1 ||
+ GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
return;
wxRect rect = CellToRect(row, col);
}
}
+void wxGrid::RedrawGridLines()
+{
+ // the lines will be redrawn when the window is thawn
+ if ( GetBatchCount() )
+ return;
+
+ if ( GridLinesEnabled() )
+ {
+ wxClientDC dc( m_gridWin );
+ PrepareDC( dc );
+ DrawAllGridLines( dc, wxRegion() );
+ }
+ else // remove the grid lines
+ {
+ m_gridWin->Refresh();
+ }
+}
+
void wxGrid::EnableGridLines( bool enable )
{
if ( enable != m_gridLinesEnabled )
{
m_gridLinesEnabled = enable;
- if ( !GetBatchCount() )
- {
- if ( enable )
- {
- wxClientDC dc( m_gridWin );
- PrepareDC( dc );
- DrawAllGridLines( dc, wxRegion() );
- }
- else
- {
- m_gridWin->Refresh();
- }
- }
+ RedrawGridLines();
+ }
+}
+
+void wxGrid::DoClipGridLines(bool& var, bool clip)
+{
+ if ( clip != var )
+ {
+ var = clip;
+
+ if ( GridLinesEnabled() )
+ RedrawGridLines();
}
}
-int wxGrid::GetDefaultRowSize()
+int wxGrid::GetDefaultRowSize() const
{
return m_defaultRowHeight;
}
-int wxGrid::GetRowSize( int row )
+int wxGrid::GetRowSize( int row ) const
{
wxCHECK_MSG( row >= 0 && row < m_numRows, 0, _T("invalid row index") );
return GetRowHeight(row);
}
-int wxGrid::GetDefaultColSize()
+int wxGrid::GetDefaultColSize() const
{
return m_defaultColWidth;
}
-int wxGrid::GetColSize( int col )
+int wxGrid::GetColSize( int col ) const
{
wxCHECK_MSG( col >= 0 && col < m_numCols, 0, _T("invalid column index") );
}
// ----------------------------------------------------------------------------
-// access to the default attrbiutes
+// access to the default attributes
// ----------------------------------------------------------------------------
-wxColour wxGrid::GetDefaultCellBackgroundColour()
+wxColour wxGrid::GetDefaultCellBackgroundColour() const
{
return m_defaultCellAttr->GetBackgroundColour();
}
-wxColour wxGrid::GetDefaultCellTextColour()
+wxColour wxGrid::GetDefaultCellTextColour() const
{
return m_defaultCellAttr->GetTextColour();
}
-wxFont wxGrid::GetDefaultCellFont()
+wxFont wxGrid::GetDefaultCellFont() const
{
return m_defaultCellAttr->GetFont();
}
-void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert )
+void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert ) const
{
m_defaultCellAttr->GetAlignment(horiz, vert);
}
-bool wxGrid::GetDefaultCellOverflow()
+bool wxGrid::GetDefaultCellOverflow() const
{
return m_defaultCellAttr->GetOverflow();
}
// access to cell attributes
// ----------------------------------------------------------------------------
-wxColour wxGrid::GetCellBackgroundColour(int row, int col)
+wxColour wxGrid::GetCellBackgroundColour(int row, int col) const
{
wxGridCellAttr *attr = GetCellAttr(row, col);
wxColour colour = attr->GetBackgroundColour();
return colour;
}
-wxColour wxGrid::GetCellTextColour( int row, int col )
+wxColour wxGrid::GetCellTextColour( int row, int col ) const
{
wxGridCellAttr *attr = GetCellAttr(row, col);
wxColour colour = attr->GetTextColour();
return colour;
}
-wxFont wxGrid::GetCellFont( int row, int col )
+wxFont wxGrid::GetCellFont( int row, int col ) const
{
wxGridCellAttr *attr = GetCellAttr(row, col);
wxFont font = attr->GetFont();
return font;
}
-void wxGrid::GetCellAlignment( int row, int col, int *horiz, int *vert )
+void wxGrid::GetCellAlignment( int row, int col, int *horiz, int *vert ) const
{
wxGridCellAttr *attr = GetCellAttr(row, col);
attr->GetAlignment(horiz, vert);
attr->DecRef();
}
-bool wxGrid::GetCellOverflow( int row, int col )
+bool wxGrid::GetCellOverflow( int row, int col ) const
{
wxGridCellAttr *attr = GetCellAttr(row, col);
bool allow = attr->GetOverflow();
return allow;
}
-void wxGrid::GetCellSize( int row, int col, int *num_rows, int *num_cols )
+void wxGrid::GetCellSize( int row, int col, int *num_rows, int *num_cols ) const
{
wxGridCellAttr *attr = GetCellAttr(row, col);
attr->GetSize( num_rows, num_cols );
attr->DecRef();
}
-wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col)
+wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col) const
{
wxGridCellAttr* attr = GetCellAttr(row, col);
wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col);
return renderer;
}
-wxGridCellEditor* wxGrid::GetCellEditor(int row, int col)
+wxGridCellEditor* wxGrid::GetCellEditor(int row, int col) const
{
wxGridCellAttr* attr = GetCellAttr(row, col);
wxGridCellEditor* editor = attr->GetEditor(this, row, col);
// attribute support: cache, automatic provider creation, ...
// ----------------------------------------------------------------------------
-bool wxGrid::CanHaveAttributes()
+bool wxGrid::CanHaveAttributes() const
{
if ( !m_table )
{
{
if ( m_attrCache.row != -1 )
{
- wxSafeDecRef(m_attrCache.attr);
+ wxGridCellAttr *oldAttr = m_attrCache.attr;
m_attrCache.attr = NULL;
m_attrCache.row = -1;
+ // wxSafeDecRec(...) might cause event processing that accesses
+ // the cached attribute, if one exists (e.g. by deleting the
+ // editor stored within the attribute). Therefore it is important
+ // to invalidate the cache before calling wxSafeDecRef!
+ wxSafeDecRef(oldAttr);
}
}
if ( !LookupAttr(row, col, &attr) )
{
attr = m_table ? m_table->GetAttr(row, col, wxGridCellAttr::Any)
- : (wxGridCellAttr *)NULL;
+ : NULL;
CacheAttr(row, col, attr);
}
}
wxGridCellAttr *wxGrid::GetOrCreateCellAttr(int row, int col) const
{
- wxGridCellAttr *attr = (wxGridCellAttr *)NULL;
+ wxGridCellAttr *attr = NULL;
bool canHave = ((wxGrid*)this)->CanHaveAttributes();
wxCHECK_MSG( canHave, attr, _T("Cell attributes not allowed"));
attr = new wxGridCellAttr;
wxGridCellRenderer *renderer = GetDefaultRendererForType(typeName);
attr->SetRenderer(renderer);
+ wxGridCellEditor *editor = GetDefaultEditorForType(typeName);
+ attr->SetEditor(editor);
SetColAttr(col, attr);
wxT("wxGrid::SetCellSize setting cell size to < 1"));
// if this was already a multicell then "turn off" the other cells first
- if ((cell_rows > 1) || (cell_rows > 1))
+ if ((cell_rows > 1) || (cell_cols > 1))
{
int i, j;
for (j=row; j < row + cell_rows; j++)
int index = m_typeRegistry->FindOrCloneDataType(typeName);
if ( index == wxNOT_FOUND )
{
- wxString errStr;
-
- errStr.Printf(wxT("Unknown data type name [%s]"), typeName.c_str());
- wxFAIL_MSG(errStr.c_str());
+ wxFAIL_MSG(wxString::Format(wxT("Unknown data type name [%s]"), typeName.c_str()));
return NULL;
}
int index = m_typeRegistry->FindOrCloneDataType(typeName);
if ( index == wxNOT_FOUND )
{
- wxString errStr;
-
- errStr.Printf(wxT("Unknown data type name [%s]"), typeName.c_str());
- wxFAIL_MSG(errStr.c_str());
+ wxFAIL_MSG(wxString::Format(wxT("Unknown data type name [%s]"), typeName.c_str()));
return NULL;
}
{
wxCHECK_RET( row >= 0 && row < m_numRows, _T("invalid row index") );
+ // if < 0 then calculate new height from label
+ if ( height < 0 )
+ {
+ long w, h;
+ wxArrayString lines;
+ wxClientDC dc(m_rowLabelWin);
+ dc.SetFont(GetLabelFont());
+ StringToLines(GetRowLabelValue( row ), lines);
+ GetTextBoxSize( dc, lines, &w, &h );
+ //check that it is not less than the minimal height
+ height = wxMax(h, GetRowMinimalAcceptableHeight());
+ }
+
// See comment in SetColSize
if ( height < GetRowMinimalAcceptableHeight())
return;
void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols )
{
- m_defaultColWidth = wxMax( width, m_minAcceptableColWidth );
+ // we dont allow zero default column width
+ m_defaultColWidth = wxMax( wxMax( width, m_minAcceptableColWidth ), 1 );
if ( resizeExistingCols )
{
{
wxCHECK_RET( col >= 0 && col < m_numCols, _T("invalid column index") );
- // should we check that it's bigger than GetColMinimalWidth(col) here?
- // (VZ)
- // No, because it is reasonable to assume the library user know's
- // what he is doing. However we should test against the weaker
- // constraint of minimalAcceptableWidth, as this breaks rendering
- //
- // This test then fixes sf.net bug #645734
-
- if ( width < GetColMinimalAcceptableWidth() )
- return;
-
- if ( m_colWidths.IsEmpty() )
- {
- // need to really create the array
- InitColWidths();
- }
-
// if < 0 then calculate new width from label
if ( width < 0 )
{
long w, h;
wxArrayString lines;
- wxClientDC dc(m_colLabelWin);
+ wxClientDC dc(m_colWindow);
dc.SetFont(GetLabelFont());
StringToLines(GetColLabelValue(col), lines);
- GetTextBoxSize(dc, lines, &w, &h);
+ if ( GetColLabelTextOrientation() == wxHORIZONTAL )
+ GetTextBoxSize( dc, lines, &w, &h );
+ else
+ GetTextBoxSize( dc, lines, &h, &w );
width = w + 6;
+ //check that it is not less than the minimal width
+ width = wxMax(width, GetColMinimalAcceptableWidth());
+ }
+
+ // we intentionally don't test whether the width is less than
+ // GetColMinimalWidth() here but we do compare it with
+ // GetColMinimalAcceptableWidth() as otherwise things currently break (see
+ // #651) -- and we also always allow the width of 0 as it has the special
+ // sense of hiding the column
+ if ( width > 0 && width < GetColMinimalAcceptableWidth() )
+ return;
+
+ if ( m_colWidths.IsEmpty() )
+ {
+ // need to really create the array
+ InitColWidths();
}
- int w = wxMax( 0, width );
- int diff = w - m_colWidths[col];
- m_colWidths[col] = w;
+ const int diff = width - m_colWidths[col];
+ m_colWidths[col] = width;
+ if ( m_useNativeHeader )
+ GetGridColHeader()->UpdateColumn(col);
+ //else: will be refreshed when the header is redrawn
for ( int colPos = GetColPos(col); colPos < m_numCols; colPos++ )
{
}
if ( !GetBatchCount() )
+ {
CalcDimensions();
+ Refresh();
+ }
}
void wxGrid::SetColMinimalWidth( int col, int width )
// auto sizing
// ----------------------------------------------------------------------------
-void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
+void
+wxGrid::AutoSizeColOrRow(int colOrRow, bool setAsMin, wxGridDirection direction)
{
+ const bool column = direction == wxGRID_COLUMN;
+
wxClientDC dc(m_gridWin);
// cancel editing of cell
if ( column )
{
+ // Ensure automatic width is not less than minimal width. See the
+ // comment in SetColSize() for explanation of why this isn't done
+ // in SetColSize().
+ if ( !setAsMin )
+ extentMax = wxMax(extentMax, GetColMinimalWidth(col));
+
SetColSize( col, extentMax );
if ( !GetBatchCount() )
{
- int cw, ch, dummy;
- m_gridWin->GetClientSize( &cw, &ch );
- wxRect rect ( CellToRect( 0, col ) );
- rect.y = 0;
- CalcScrolledPosition(rect.x, 0, &rect.x, &dummy);
- rect.width = cw - rect.x;
- rect.height = m_colLabelHeight;
- m_colLabelWin->Refresh( true, &rect );
+ if ( m_useNativeHeader )
+ {
+ GetGridColHeader()->UpdateColumn(col);
+ }
+ else
+ {
+ int cw, ch, dummy;
+ m_gridWin->GetClientSize( &cw, &ch );
+ wxRect rect ( CellToRect( 0, col ) );
+ rect.y = 0;
+ CalcScrolledPosition(rect.x, 0, &rect.x, &dummy);
+ rect.width = cw - rect.x;
+ rect.height = m_colLabelHeight;
+ GetColLabelWindow()->Refresh( true, &rect );
+ }
}
}
else
{
+ // Ensure automatic width is not less than minimal height. See the
+ // comment in SetColSize() for explanation of why this isn't done
+ // in SetRowSize().
+ if ( !setAsMin )
+ extentMax = wxMax(extentMax, GetRowMinimalHeight(row));
+
SetRowSize(row, extentMax);
if ( !GetBatchCount() )
{
}
}
+wxCoord wxGrid::CalcColOrRowLabelAreaMinSize(wxGridDirection direction)
+{
+ // calculate size for the rows or columns?
+ const bool calcRows = direction == wxGRID_ROW;
+
+ wxClientDC dc(calcRows ? GetGridRowLabelWindow()
+ : GetGridColLabelWindow());
+ dc.SetFont(GetLabelFont());
+
+ // which dimension should we take into account for calculations?
+ //
+ // for columns, the text can be only horizontal so it's easy but for rows
+ // we also have to take into account the text orientation
+ const bool
+ useWidth = calcRows || (GetColLabelTextOrientation() == wxVERTICAL);
+
+ wxArrayString lines;
+ wxCoord extentMax = 0;
+
+ const int numRowsOrCols = calcRows ? m_numRows : m_numCols;
+ for ( int rowOrCol = 0; rowOrCol < numRowsOrCols; rowOrCol++ )
+ {
+ lines.Clear();
+
+ wxString label = calcRows ? GetRowLabelValue(rowOrCol)
+ : GetColLabelValue(rowOrCol);
+ StringToLines(label, lines);
+
+ long w, h;
+ GetTextBoxSize(dc, lines, &w, &h);
+
+ const wxCoord extent = useWidth ? w : h;
+ if ( extent > extentMax )
+ extentMax = extent;
+ }
+
+ if ( !extentMax )
+ {
+ // empty column - give default extent (notice that if extentMax is less
+ // than default extent but != 0, it's OK)
+ extentMax = calcRows ? GetDefaultRowLabelSize()
+ : GetDefaultColLabelSize();
+ }
+
+ // leave some space around text (taken from AutoSizeColOrRow)
+ if ( calcRows )
+ extentMax += 10;
+ else
+ extentMax += 6;
+
+ return extentMax;
+}
+
int wxGrid::SetOrCalcColumnSizes(bool calcOnly, bool setAsMin)
{
int width = m_rowLabelWidth;
- if ( !calcOnly )
- BeginBatch();
+ wxGridUpdateLocker locker;
+ if(!calcOnly)
+ locker.Create(this);
for ( int col = 0; col < m_numCols; col++ )
{
width += GetColWidth(col);
}
- if ( !calcOnly )
- EndBatch();
-
return width;
}
{
int height = m_colLabelHeight;
- if ( !calcOnly )
- BeginBatch();
+ wxGridUpdateLocker locker;
+ if(!calcOnly)
+ locker.Create(this);
for ( int row = 0; row < m_numRows; row++ )
{
height += GetRowHeight(row);
}
- if ( !calcOnly )
- EndBatch();
-
return height;
}
void wxGrid::AutoSize()
{
- BeginBatch();
+ wxGridUpdateLocker locker(this);
- // we need to round up the size of the scrollable area to a multiple of
- // scroll step to ensure that we don't get the scrollbars when we're sized
- // exactly to fit our contents
wxSize size(SetOrCalcColumnSizes(false) - m_rowLabelWidth + m_extraWidth,
SetOrCalcRowSizes(false) - m_colLabelHeight + m_extraHeight);
- wxSize sizeFit(GetScrollX(size.x) * GetScrollLineX(),
- GetScrollY(size.y) * GetScrollLineY());
-
- // distribute the extra space between the columns/rows to avoid having
- // extra white space
- wxCoord diff = sizeFit.x - size.x;
- if ( diff && m_numCols )
- {
- // try to resize the columns uniformly
- wxCoord diffPerCol = diff / m_numCols;
- if ( diffPerCol )
- {
- for ( int col = 0; col < m_numCols; col++ )
- {
- SetColSize(col, GetColWidth(col) + diffPerCol);
- }
- }
-
- // add remaining amount to the last columns
- diff -= diffPerCol * m_numCols;
- if ( diff )
- {
- for ( int col = m_numCols - 1; col >= m_numCols - diff; col-- )
- {
- SetColSize(col, GetColWidth(col) + 1);
- }
- }
- }
-
- // same for rows
- diff = sizeFit.y - size.y;
- if ( diff && m_numRows )
- {
- // try to resize the columns uniformly
- wxCoord diffPerRow = diff / m_numRows;
- if ( diffPerRow )
- {
- for ( int row = 0; row < m_numRows; row++ )
- {
- SetRowSize(row, GetRowHeight(row) + diffPerRow);
- }
- }
-
- // add remaining amount to the last rows
- diff -= diffPerRow * m_numRows;
- if ( diff )
- {
- for ( int row = m_numRows - 1; row >= m_numRows - diff; row-- )
- {
- SetRowSize(row, GetRowHeight(row) + 1);
- }
- }
- }
// we know that we're not going to have scrollbars so disable them now to
// avoid trouble in SetClientSize() which can otherwise set the correct
// client size but also leave space for (not needed any more) scrollbars
SetScrollbars(0, 0, 0, 0, 0, 0, true);
- SetClientSize(sizeFit.x + m_rowLabelWidth, sizeFit.y + m_colLabelHeight);
- EndBatch();
+ // restore the scroll rate parameters overwritten by SetScrollbars()
+ SetScrollRate(m_scrollLineX, m_scrollLineY);
+
+ SetClientSize(size.x + m_rowLabelWidth, size.y + m_colLabelHeight);
}
void wxGrid::AutoSizeRowLabelSize( int row )
{
- wxArrayString lines;
- long w, h;
-
// Hide the edit control, so it
// won't interfere with drag-shrinking.
if ( IsCellEditControlShown() )
}
// autosize row height depending on label text
- StringToLines( GetRowLabelValue( row ), lines );
- wxClientDC dc( m_rowLabelWin );
- GetTextBoxSize( dc, lines, &w, &h );
- if ( h < m_defaultRowHeight )
- h = m_defaultRowHeight;
- SetRowSize(row, h);
+ SetRowSize(row, -1);
ForceRefresh();
}
void wxGrid::AutoSizeColLabelSize( int col )
{
- wxArrayString lines;
- long w, h;
-
// Hide the edit control, so it
// won't interfere with drag-shrinking.
if ( IsCellEditControlShown() )
}
// autosize column width depending on label text
- StringToLines( GetColLabelValue( col ), lines );
- wxClientDC dc( m_colLabelWin );
- if ( GetColLabelTextOrientation() == wxHORIZONTAL )
- GetTextBoxSize( dc, lines, &w, &h );
- else
- GetTextBoxSize( dc, lines, &h, &w );
- if ( w < m_defaultColWidth )
- w = m_defaultColWidth;
- SetColSize(col, w);
+ SetColSize(col, -1);
ForceRefresh();
}
// change the column/row sizes, only calculate them
wxSize size(self->SetOrCalcColumnSizes(true) - m_rowLabelWidth + m_extraWidth,
self->SetOrCalcRowSizes(true) - m_colLabelHeight + m_extraHeight);
- wxSize sizeFit(GetScrollX(size.x) * GetScrollLineX(),
- GetScrollY(size.y) * GetScrollLineY());
// NOTE: This size should be cached, but first we need to add calls to
// InvalidateBestSize everywhere that could change the results of this
// calculation.
// CacheBestSize(size);
- return wxSize(sizeFit.x + m_rowLabelWidth, sizeFit.y + m_colLabelHeight)
+ return wxSize(size.x + m_rowLabelWidth, size.y + m_colLabelHeight)
+ GetWindowBorderSize();
}
void wxGrid::SelectRow( int row, bool addToSelected )
{
- if ( IsSelection() && !addToSelected )
+ if ( !m_selection )
+ return;
+
+ if ( !addToSelected )
ClearSelection();
- if ( m_selection )
- m_selection->SelectRow( row, false, addToSelected );
+ m_selection->SelectRow(row);
}
void wxGrid::SelectCol( int col, bool addToSelected )
{
- if ( IsSelection() && !addToSelected )
+ if ( !m_selection )
+ return;
+
+ if ( !addToSelected )
ClearSelection();
- if ( m_selection )
- m_selection->SelectCol( col, false, addToSelected );
+ m_selection->SelectCol(col);
}
-void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol,
- bool addToSelected )
+void wxGrid::SelectBlock(int topRow, int leftCol, int bottomRow, int rightCol,
+ bool addToSelected)
{
- if ( IsSelection() && !addToSelected )
+ if ( !m_selection )
+ return;
+
+ if ( !addToSelected )
ClearSelection();
- if ( m_selection )
- m_selection->SelectBlock( topRow, leftCol, bottomRow, rightCol,
- false, addToSelected );
+ m_selection->SelectBlock(topRow, leftCol, bottomRow, rightCol);
}
void wxGrid::SelectAll()
// cell, row and col deselection
// ----------------------------------------------------------------------------
-void wxGrid::DeselectRow( int row )
+void wxGrid::DeselectLine(int line, const wxGridOperations& oper)
{
if ( !m_selection )
return;
- if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows )
+ const wxGridSelectionModes mode = m_selection->GetSelectionMode();
+ if ( mode == oper.GetSelectionMode() )
{
- if ( m_selection->IsInSelection(row, 0 ) )
- m_selection->ToggleCellSelection(row, 0);
+ const wxGridCellCoords c(oper.MakeCoords(line, 0));
+ if ( m_selection->IsInSelection(c) )
+ m_selection->ToggleCellSelection(c);
}
- else
+ else if ( mode != oper.Dual().GetSelectionMode() )
{
- int nCols = GetNumberCols();
- for ( int i = 0; i < nCols; i++ )
+ const int nOther = oper.Dual().GetNumberOfLines(this);
+ for ( int i = 0; i < nOther; i++ )
{
- if ( m_selection->IsInSelection(row, i ) )
- m_selection->ToggleCellSelection(row, i);
+ const wxGridCellCoords c(oper.MakeCoords(line, i));
+ if ( m_selection->IsInSelection(c) )
+ m_selection->ToggleCellSelection(c);
}
}
+ //else: can only select orthogonal lines so no lines in this direction
+ // could have been selected anyhow
}
-void wxGrid::DeselectCol( int col )
+void wxGrid::DeselectRow(int row)
{
- if ( !m_selection )
- return;
+ DeselectLine(row, wxGridRowOperations());
+}
- if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns )
- {
- if ( m_selection->IsInSelection(0, col ) )
- m_selection->ToggleCellSelection(0, col);
- }
- else
- {
- int nRows = GetNumberRows();
- for ( int i = 0; i < nRows; i++ )
- {
- if ( m_selection->IsInSelection(i, col ) )
- m_selection->ToggleCellSelection(i, col);
- }
- }
+void wxGrid::DeselectCol(int col)
+{
+ DeselectLine(col, wxGridColumnOperations());
}
void wxGrid::DeselectCell( int row, int col )
m_selection->ToggleCellSelection(row, col);
}
-bool wxGrid::IsSelection()
+bool wxGrid::IsSelection() const
{
return ( m_selection && (m_selection->IsSelection() ||
- ( m_selectingTopLeft != wxGridNoCellCoords &&
- m_selectingBottomRight != wxGridNoCellCoords) ) );
+ ( m_selectedBlockTopLeft != wxGridNoCellCoords &&
+ m_selectedBlockBottomRight != wxGridNoCellCoords) ) );
}
bool wxGrid::IsInSelection( int row, int col ) const
{
return ( m_selection && (m_selection->IsInSelection( row, col ) ||
- ( row >= m_selectingTopLeft.GetRow() &&
- col >= m_selectingTopLeft.GetCol() &&
- row <= m_selectingBottomRight.GetRow() &&
- col <= m_selectingBottomRight.GetCol() )) );
+ ( row >= m_selectedBlockTopLeft.GetRow() &&
+ col >= m_selectedBlockTopLeft.GetCol() &&
+ row <= m_selectedBlockBottomRight.GetRow() &&
+ col <= m_selectedBlockBottomRight.GetCol() )) );
}
wxGridCellCoordsArray wxGrid::GetSelectedCells() const
void wxGrid::ClearSelection()
{
- m_selectingTopLeft =
- m_selectingBottomRight =
- m_selectingKeyboard = wxGridNoCellCoords;
+ wxRect r1 = BlockToDeviceRect(m_selectedBlockTopLeft,
+ m_selectedBlockBottomRight);
+ wxRect r2 = BlockToDeviceRect(m_currentCellCoords,
+ m_selectedBlockCorner);
+
+ m_selectedBlockTopLeft =
+ m_selectedBlockBottomRight =
+ m_selectedBlockCorner = wxGridNoCellCoords;
+
+ Refresh( false, &r1 );
+ Refresh( false, &r2 );
+
if ( m_selection )
m_selection->ClearSelection();
}
// This function returns the rectangle that encloses the given block
// in device coords clipped to the client size of the grid window.
//
-wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft,
- const wxGridCellCoords &bottomRight )
+wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords& topLeft,
+ const wxGridCellCoords& bottomRight ) const
{
- wxRect rect( wxGridNoCellRect );
- wxRect cellRect;
-
- cellRect = CellToRect( topLeft );
- if ( cellRect != wxGridNoCellRect )
+ wxRect resultRect;
+ wxRect tempCellRect = CellToRect(topLeft);
+ if ( tempCellRect != wxGridNoCellRect )
{
- rect = cellRect;
+ resultRect = tempCellRect;
}
else
{
- rect = wxRect(0, 0, 0, 0);
+ resultRect = wxRect(0, 0, 0, 0);
}
- cellRect = CellToRect( bottomRight );
- if ( cellRect != wxGridNoCellRect )
+ tempCellRect = CellToRect(bottomRight);
+ if ( tempCellRect != wxGridNoCellRect )
{
- rect += cellRect;
+ resultRect += tempCellRect;
}
else
{
+ // If both inputs were "wxGridNoCellRect," then there's nothing to do.
return wxGridNoCellRect;
}
- int i, j;
- int left = rect.GetLeft();
- int top = rect.GetTop();
- int right = rect.GetRight();
- int bottom = rect.GetBottom();
+ // Ensure that left/right and top/bottom pairs are in order.
+ int left = resultRect.GetLeft();
+ int top = resultRect.GetTop();
+ int right = resultRect.GetRight();
+ int bottom = resultRect.GetBottom();
int leftCol = topLeft.GetCol();
int topRow = topLeft.GetRow();
if (left > right)
{
- i = left;
+ int tmp = left;
left = right;
- right = i;
- i = leftCol;
+ right = tmp;
+
+ tmp = leftCol;
leftCol = rightCol;
- rightCol = i;
+ rightCol = tmp;
}
if (top > bottom)
{
- i = top;
+ int tmp = top;
top = bottom;
- bottom = i;
- i = topRow;
+ bottom = tmp;
+
+ tmp = topRow;
topRow = bottomRow;
- bottomRow = i;
+ bottomRow = tmp;
}
- for ( j = topRow; j <= bottomRow; j++ )
+ // The following loop is ONLY necessary to detect and handle merged cells.
+ int cw, ch;
+ m_gridWin->GetClientSize( &cw, &ch );
+
+ // Get the origin coordinates: notice that they will be negative if the
+ // grid is scrolled downwards/to the right.
+ int gridOriginX = 0;
+ int gridOriginY = 0;
+ CalcScrolledPosition(gridOriginX, gridOriginY, &gridOriginX, &gridOriginY);
+
+ int onScreenLeftmostCol = internalXToCol(-gridOriginX);
+ int onScreenUppermostRow = internalYToRow(-gridOriginY);
+
+ int onScreenRightmostCol = internalXToCol(-gridOriginX + cw);
+ int onScreenBottommostRow = internalYToRow(-gridOriginY + ch);
+
+ // Bound our loop so that we only examine the portion of the selected block
+ // that is shown on screen. Therefore, we compare the Top-Left block values
+ // to the Top-Left screen values, and the Bottom-Right block values to the
+ // Bottom-Right screen values, choosing appropriately.
+ const int visibleTopRow = wxMax(topRow, onScreenUppermostRow);
+ const int visibleBottomRow = wxMin(bottomRow, onScreenBottommostRow);
+ const int visibleLeftCol = wxMax(leftCol, onScreenLeftmostCol);
+ const int visibleRightCol = wxMin(rightCol, onScreenRightmostCol);
+
+ for ( int j = visibleTopRow; j <= visibleBottomRow; j++ )
{
- for ( i = leftCol; i <= rightCol; i++ )
+ for ( int i = visibleLeftCol; i <= visibleRightCol; i++ )
{
- if ((j == topRow) || (j == bottomRow) || (i == leftCol) || (i == rightCol))
+ if ( (j == visibleTopRow) || (j == visibleBottomRow) ||
+ (i == visibleLeftCol) || (i == visibleRightCol) )
{
- cellRect = CellToRect( j, i );
-
- if (cellRect.x < left)
- left = cellRect.x;
- if (cellRect.y < top)
- top = cellRect.y;
- if (cellRect.x + cellRect.width > right)
- right = cellRect.x + cellRect.width;
- if (cellRect.y + cellRect.height > bottom)
- bottom = cellRect.y + cellRect.height;
+ tempCellRect = CellToRect( j, i );
+
+ if (tempCellRect.x < left)
+ left = tempCellRect.x;
+ if (tempCellRect.y < top)
+ top = tempCellRect.y;
+ if (tempCellRect.x + tempCellRect.width > right)
+ right = tempCellRect.x + tempCellRect.width;
+ if (tempCellRect.y + tempCellRect.height > bottom)
+ bottom = tempCellRect.y + tempCellRect.height;
}
else
{
- i = rightCol; // jump over inner cells.
+ i = visibleRightCol; // jump over inner cells.
}
}
}
- // convert to scrolled coords
- //
+ // Convert to scrolled coords
CalcScrolledPosition( left, top, &left, &top );
CalcScrolledPosition( right, bottom, &right, &bottom );
- int cw, ch;
- m_gridWin->GetClientSize( &cw, &ch );
-
if (right < 0 || bottom < 0 || left > cw || top > ch)
return wxRect(0,0,0,0);
- rect.SetLeft( wxMax(0, left) );
- rect.SetTop( wxMax(0, top) );
- rect.SetRight( wxMin(cw, right) );
- rect.SetBottom( wxMin(ch, bottom) );
+ resultRect.SetLeft( wxMax(0, left) );
+ resultRect.SetTop( wxMax(0, top) );
+ resultRect.SetRight( wxMin(cw, right) );
+ resultRect.SetBottom( wxMin(ch, bottom) );
- return rect;
+ return resultRect;
+}
+
+// ----------------------------------------------------------------------------
+// drop target
+// ----------------------------------------------------------------------------
+
+#if wxUSE_DRAG_AND_DROP
+
+// this allow setting drop target directly on wxGrid
+void wxGrid::SetDropTarget(wxDropTarget *dropTarget)
+{
+ GetGridWindow()->SetDropTarget(dropTarget);
}
+#endif // wxUSE_DRAG_AND_DROP
+
// ----------------------------------------------------------------------------
// grid event classes
// ----------------------------------------------------------------------------
wxGridEvent::wxGridEvent( int id, wxEventType type, wxObject* obj,
int row, int col, int x, int y, bool sel,
bool control, bool shift, bool alt, bool meta )
- : wxNotifyEvent( type, id )
+ : wxNotifyEvent( type, id ),
+ wxKeyboardState(control, shift, alt, meta)
{
- m_row = row;
- m_col = col;
- m_x = x;
- m_y = y;
- m_selecting = sel;
- m_control = control;
- m_shift = shift;
- m_alt = alt;
- m_meta = meta;
+ Init(row, col, x, y, sel);
SetEventObject(obj);
}
-
IMPLEMENT_DYNAMIC_CLASS( wxGridSizeEvent, wxNotifyEvent )
wxGridSizeEvent::wxGridSizeEvent( int id, wxEventType type, wxObject* obj,
int rowOrCol, int x, int y,
bool control, bool shift, bool alt, bool meta )
- : wxNotifyEvent( type, id )
+ : wxNotifyEvent( type, id ),
+ wxKeyboardState(control, shift, alt, meta)
{
- m_rowOrCol = rowOrCol;
- m_x = x;
- m_y = y;
- m_control = control;
- m_shift = shift;
- m_alt = alt;
- m_meta = meta;
+ Init(rowOrCol, x, y);
SetEventObject(obj);
}
const wxGridCellCoords& bottomRight,
bool sel, bool control,
bool shift, bool alt, bool meta )
- : wxNotifyEvent( type, id )
-{
- m_topLeft = topLeft;
- m_bottomRight = bottomRight;
- m_selecting = sel;
- m_control = control;
- m_shift = shift;
- m_alt = alt;
- m_meta = meta;
+ : wxNotifyEvent( type, id ),
+ wxKeyboardState(control, shift, alt, meta)
+{
+ Init(topLeft, bottomRight, sel);
SetEventObject(obj);
}
projects / wxWidgets.git / blobdiff