X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0b190b0f6ae1de468733c1c8f8aad877a7d44792..444cb676b239bd5d87c645c21c800053271cc348:/include/wx/generic/grid.h diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h index 5295d43d2a..5f707fb54b 100644 --- a/include/wx/generic/grid.h +++ b/include/wx/generic/grid.h @@ -48,7 +48,7 @@ #define WXGRID_DEFAULT_COL_WIDTH 80 #define WXGRID_DEFAULT_COL_LABEL_HEIGHT 32 #define WXGRID_DEFAULT_ROW_LABEL_WIDTH 82 -#define WXGRID_LABEL_EDGE_ZONE 5 +#define WXGRID_LABEL_EDGE_ZONE 2 #define WXGRID_MIN_ROW_HEIGHT 15 #define WXGRID_MIN_COL_WIDTH 15 #define WXGRID_DEFAULT_SCROLLBAR_WIDTH 16 @@ -58,6 +58,7 @@ #define wxGRID_VALUE_BOOL _T("bool") #define wxGRID_VALUE_NUMBER _T("long") #define wxGRID_VALUE_FLOAT _T("double") +#define wxGRID_VALUE_CHOICE _T("choice") #define wxGRID_VALUE_TEXT wxGRID_VALUE_STRING #define wxGRID_VALUE_LONG wxGRID_VALUE_NUMBER @@ -75,6 +76,7 @@ class WXDLLEXPORT wxGridRowLabelWindow; class WXDLLEXPORT wxGridTableBase; class WXDLLEXPORT wxGridWindow; class WXDLLEXPORT wxGridTypeRegistry; +class WXDLLEXPORT wxGridSelection; class WXDLLEXPORT wxCheckBox; class WXDLLEXPORT wxComboBox; @@ -89,17 +91,17 @@ class WXDLLEXPORT wxSpinCtrl; #define wxSafeDecRef(p) if ( p ) (p)->DecRef() // ---------------------------------------------------------------------------- -// wxGridCellRenderer: this class is responsible for actually drawing the cell -// in the grid. You may pass it to the wxGridCellAttr (below) to change the -// format of one given cell or to wxGrid::SetDefaultRenderer() to change the -// view of all cells. This is an ABC, you will normally use one of the -// predefined derived classes or derive your own class from it. +// wxGridCellWorker: common base class for wxGridCellRenderer and +// wxGridCellEditor +// +// NB: this is more an implementation convenience than a design issue, so this +// class is not documented and is not public at all // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxGridCellRenderer +class WXDLLEXPORT wxGridCellWorker { public: - wxGridCellRenderer() { m_nRef = 1; } + wxGridCellWorker() { m_nRef = 1; } // this class is ref counted: it is created with ref count of 1, so // calling DecRef() once will delete it. Calling IncRef() allows to lock @@ -107,6 +109,34 @@ public: void IncRef() { m_nRef++; } void DecRef() { if ( !--m_nRef ) delete this; } + // interpret renderer parameters: arbitrary string whose interpretatin is + // left to the derived classes + virtual void SetParameters(const wxString& params); + +protected: + // virtual dtor for any base class - private because only DecRef() can + // delete us + virtual ~wxGridCellWorker(); + +private: + size_t m_nRef; + + // suppress the stupid gcc warning about the class having private dtor and + // no friends + friend class wxGridCellWorkerDummyFriend; +}; + +// ---------------------------------------------------------------------------- +// wxGridCellRenderer: this class is responsible for actually drawing the cell +// in the grid. You may pass it to the wxGridCellAttr (below) to change the +// format of one given cell or to wxGrid::SetDefaultRenderer() to change the +// view of all cells. This is an ABC, you will normally use one of the +// predefined derived classes or derive your own class from it. +// ---------------------------------------------------------------------------- + +class WXDLLEXPORT wxGridCellRenderer : public wxGridCellWorker +{ +public: // draw the given cell on the provided DC inside the given rectangle // using the style specified by the attribute and the default or selected // state corresponding to the isSelected value. @@ -127,21 +157,8 @@ public: wxDC& dc, int row, int col) = 0; - // interpret renderer parameters: arbitrary string whose interpretatin is - // left to the derived classes - virtual void SetParameters(const wxString& params); - -protected: - // virtual dtor for any base class - private because only DecRef() can - // delete us - virtual ~wxGridCellRenderer(); - -private: - size_t m_nRef; - - // suppress the stupid gcc warning about the class having private dtor and - // no friends - friend class wxGridCellRendererDummyFriend; + // create a new object which is the copy of this one + virtual wxGridCellRenderer *Clone() const = 0; }; // the default renderer for the cells containing string data @@ -162,6 +179,9 @@ public: wxDC& dc, int row, int col); + virtual wxGridCellRenderer *Clone() const + { return new wxGridCellStringRenderer; } + protected: // set the text colours before drawing void SetTextColoursAndFont(wxGrid& grid, @@ -192,6 +212,9 @@ public: wxDC& dc, int row, int col); + virtual wxGridCellRenderer *Clone() const + { return new wxGridCellNumberRenderer; } + protected: wxString GetString(wxGrid& grid, int row, int col); }; @@ -223,6 +246,8 @@ public: // parameters string format is "width[,precision]" virtual void SetParameters(const wxString& params); + virtual wxGridCellRenderer *Clone() const; + protected: wxString GetString(wxGrid& grid, int row, int col); @@ -252,6 +277,9 @@ public: wxDC& dc, int row, int col); + virtual wxGridCellRenderer *Clone() const + { return new wxGridCellBoolRenderer; } + private: static wxSize ms_sizeCheckMark; }; @@ -264,17 +292,11 @@ private: // even for the entire grid. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxGridCellEditor +class WXDLLEXPORT wxGridCellEditor : public wxGridCellWorker { public: wxGridCellEditor(); - // this class is ref counted: it is created with ref count of 1, so - // calling DecRef() once will delete it. Calling IncRef() allows to lock - // it until the matching DecRef() is called - void IncRef() { m_nRef++; } - void DecRef() { if ( !--m_nRef ) delete this; } - bool IsCreated() { return m_control != NULL; } // Creates the actual edit control @@ -320,13 +342,13 @@ public: // Final cleanup virtual void Destroy(); + // create a new object which is the copy of this one + virtual wxGridCellEditor *Clone() const = 0; + protected: // the dtor is private because only DecRef() can delete us virtual ~wxGridCellEditor(); - // the ref count - when it goes to 0, we die - size_t m_nRef; - // the control we show on screen wxControl* m_control; @@ -362,6 +384,12 @@ public: virtual void StartingKey(wxKeyEvent& event); virtual void HandleReturn(wxKeyEvent& event); + // parameters string format is "max_width" + virtual void SetParameters(const wxString& params); + + virtual wxGridCellEditor *Clone() const + { return new wxGridCellTextEditor; } + protected: wxTextCtrl *Text() const { return (wxTextCtrl *)m_control; } @@ -370,6 +398,7 @@ protected: void DoReset(const wxString& startValue); private: + size_t m_maxChars; // max number of chars allowed wxString m_startValue; }; @@ -391,6 +420,12 @@ public: virtual void Reset(); virtual void StartingKey(wxKeyEvent& event); + // parameters string format is "min,max" + virtual void SetParameters(const wxString& params); + + virtual wxGridCellEditor *Clone() const + { return new wxGridCellNumberEditor(m_min, m_max); } + protected: wxSpinCtrl *Spin() const { return (wxSpinCtrl *)m_control; } @@ -422,6 +457,9 @@ public: virtual void Reset(); virtual void StartingKey(wxKeyEvent& event); + virtual wxGridCellEditor *Clone() const + { return new wxGridCellFloatEditor; } + protected: // string representation of m_valueOld wxString GetString() const @@ -448,6 +486,9 @@ public: virtual void Reset(); virtual void StartingClick(); + virtual wxGridCellEditor *Clone() const + { return new wxGridCellBoolEditor; } + protected: wxCheckBox *CBox() const { return (wxCheckBox *)m_control; } @@ -460,7 +501,8 @@ class WXDLLEXPORT wxGridCellChoiceEditor : public wxGridCellEditor { public: // if !allowOthers, user can't type a string not in choices array - wxGridCellChoiceEditor(size_t count, const wxChar* choices[], + wxGridCellChoiceEditor(size_t count = 0, + const wxChar* choices[] = NULL, bool allowOthers = FALSE); virtual void Create(wxWindow* parent, @@ -474,6 +516,11 @@ public: virtual void Reset(); + // parameters string format is "item1[,item2[...,itemN]]" + virtual void SetParameters(const wxString& params); + + virtual wxGridCellEditor *Clone() const; + protected: wxComboBox *Combo() const { return (wxComboBox *)m_control; } @@ -652,8 +699,8 @@ public: // You must override these functions in a derived table class // - virtual long GetNumberRows() = 0; - virtual long GetNumberCols() = 0; + virtual int GetNumberRows() = 0; + virtual int GetNumberCols() = 0; virtual bool IsEmptyCell( int row, int col ) = 0; virtual wxString GetValue( int row, int col ) = 0; virtual void SetValue( int row, int col, const wxString& value ) = 0; @@ -796,8 +843,8 @@ public: // these are pure virtual in wxGridTableBase // - long GetNumberRows(); - long GetNumberCols(); + int GetNumberRows(); + int GetNumberCols(); wxString GetValue( int row, int col ); void SetValue( int row, int col, const wxString& s ); bool IsEmptyCell( int row, int col ); @@ -847,11 +894,11 @@ public: // default copy ctor is ok - long GetRow() const { return m_row; } - void SetRow( long n ) { m_row = n; } - long GetCol() const { return m_col; } - void SetCol( long n ) { m_col = n; } - void Set( long row, long col ) { m_row = row; m_col = col; } + int GetRow() const { return m_row; } + void SetRow( int n ) { m_row = n; } + int GetCol() const { return m_col; } + void SetCol( int n ) { m_col = n; } + void Set( int row, int col ) { m_row = row; m_col = col; } wxGridCellCoords& operator=( const wxGridCellCoords& other ) { @@ -879,8 +926,8 @@ public: } private: - long m_row; - long m_col; + int m_row; + int m_col; }; @@ -914,8 +961,15 @@ public: ~wxGrid(); - bool CreateGrid( int numRows, int numCols ); + enum wxGridSelectionModes {wxGridSelectCells, + wxGridSelectRows, + wxGridSelectColumns}; + + bool CreateGrid( int numRows, int numCols, + wxGrid::wxGridSelectionModes selmode = + wxGrid::wxGridSelectCells ); + void SetSelectionMode(wxGrid::wxGridSelectionModes selmode); // ------ grid dimensions // @@ -943,7 +997,9 @@ public: void DoEndDragResizeCol(); wxGridTableBase * GetTable() const { return m_table; } - bool SetTable( wxGridTableBase *table, bool takeOwnership=FALSE ); + bool SetTable( wxGridTableBase *table, bool takeOwnership=FALSE, + wxGrid::wxGridSelectionModes selmode = + wxGrid::wxGridSelectCells ); void ClearGrid(); bool InsertRows( int pos = 0, int numRows = 1, bool updateLabels=TRUE ); @@ -1049,16 +1105,16 @@ public: void SetGridCursor( int row, int col ) { SetCurrentCell( wxGridCellCoords(row, col) ); } - bool MoveCursorUp(); - bool MoveCursorDown(); - bool MoveCursorLeft(); - bool MoveCursorRight(); + bool MoveCursorUp( bool expandSelection ); + bool MoveCursorDown( bool expandSelection ); + bool MoveCursorLeft( bool expandSelection ); + bool MoveCursorRight( bool expandSelection ); bool MovePageDown(); bool MovePageUp(); - bool MoveCursorUpBlock(); - bool MoveCursorDownBlock(); - bool MoveCursorLeftBlock(); - bool MoveCursorRightBlock(); + bool MoveCursorUpBlock( bool expandSelection ); + bool MoveCursorDownBlock( bool expandSelection ); + bool MoveCursorLeftBlock( bool expandSelection ); + bool MoveCursorRightBlock( bool expandSelection ); // ------ label and gridline formatting @@ -1223,34 +1279,15 @@ public: void SelectAll(); - bool IsSelection() - { return ( m_selectedTopLeft != wxGridNoCellCoords && - m_selectedBottomRight != wxGridNoCellCoords ); - } + bool IsSelection(); void ClearSelection(); - bool IsInSelection( int row, int col ) - { return ( IsSelection() && - row >= m_selectedTopLeft.GetRow() && - col >= m_selectedTopLeft.GetCol() && - row <= m_selectedBottomRight.GetRow() && - col <= m_selectedBottomRight.GetCol() ); - } + bool IsInSelection( int row, int col ); bool IsInSelection( const wxGridCellCoords& coords ) { return IsInSelection( coords.GetRow(), coords.GetCol() ); } - void GetSelection( int* topRow, int* leftCol, int* bottomRow, int* rightCol ) - { - // these will all be -1 if there is no selected block - // - *topRow = m_selectedTopLeft.GetRow(); - *leftCol = m_selectedTopLeft.GetCol(); - *bottomRow = m_selectedBottomRight.GetRow(); - *rightCol = m_selectedBottomRight.GetCol(); - } - // This function returns the rectangle that encloses the block of cells // limited by TopLeft and BottomRight cell in device coords and clipped @@ -1264,8 +1301,8 @@ public: // wxRect SelectionToDeviceRect() { - return BlockToDeviceRect( m_selectedTopLeft, - m_selectedBottomRight ); + return BlockToDeviceRect( m_selectingTopLeft, + m_selectingBottomRight ); } // Access or update the selection fore/back colours @@ -1330,8 +1367,8 @@ public: int GetScrollPosX() { return 0; } int GetScrollPosY() { return 0; } - void SetScrollX( int x ) { } - void SetScrollY( int y ) { } + void SetScrollX( int WXUNUSED(x) ) { } + void SetScrollY( int WXUNUSED(y) ) { } void SetColumnWidth( int col, int width ) { SetColSize( col, width ); } @@ -1433,7 +1470,7 @@ public: void SetEditable( bool edit = TRUE ) { EnableEditing( edit ); } bool GetEditInPlace() { return IsCellEditControlEnabled(); } - void SetEditInPlace(bool edit = TRUE) { } + void SetEditInPlace(bool WXUNUSED(edit) = TRUE) { } void SetCellAlignment( int align, int row, int col) { SetCellAlignment(row, col, align, wxCENTER); } @@ -1441,7 +1478,7 @@ public: void SetCellBitmap(wxBitmap *WXUNUSED(bitmap), int WXUNUSED(row), int WXUNUSED(col)) { } void SetDividerPen(const wxPen& WXUNUSED(pen)) { } - wxPen& GetDividerPen() const { return wxNullPen; } + wxPen& GetDividerPen() const; void OnActivate(bool WXUNUSED(active)) {} // ******** End of compatibility functions ********** @@ -1465,7 +1502,6 @@ protected: virtual wxSize DoGetBestSize() const; bool m_created; - bool m_displayed; wxGridWindow *m_gridWin; wxGridRowLabelWindow *m_rowLabelWin; @@ -1485,8 +1521,10 @@ protected: wxGridCellCoords m_currentCellCoords; - wxGridCellCoords m_selectedTopLeft; - wxGridCellCoords m_selectedBottomRight; + wxGridCellCoords m_selectingTopLeft; + wxGridCellCoords m_selectingBottomRight; + wxGridCellCoords m_selectingKeyboard; + wxGridSelection *m_selection; wxColour m_selectionBackground; wxColour m_selectionForeground; @@ -1679,6 +1717,7 @@ protected: bool GetModelValues(); bool SetModelValues(); + friend class wxGridSelection; DECLARE_DYNAMIC_CLASS( wxGrid ) DECLARE_EVENT_TABLE() @@ -1693,17 +1732,18 @@ class WXDLLEXPORT wxGridEvent : public wxNotifyEvent public: wxGridEvent() : wxNotifyEvent(), m_row(-1), m_col(-1), m_x(-1), m_y(-1), - m_control(0), m_meta(0), m_shift(0), m_alt(0) + m_selecting(0), m_control(0), m_meta(0), m_shift(0), m_alt(0) { } wxGridEvent(int id, wxEventType type, wxObject* obj, - int row=-1, int col=-1, int x=-1, int y=-1, + int row=-1, int col=-1, int x=-1, int y=-1, bool sel = TRUE, bool control=FALSE, bool shift=FALSE, bool alt=FALSE, bool meta=FALSE); virtual int GetRow() { return m_row; } virtual int GetCol() { return m_col; } wxPoint GetPosition() { return wxPoint( m_x, m_y ); } + bool Selecting() { return m_selecting; } bool ControlDown() { return m_control; } bool MetaDown() { return m_meta; } bool ShiftDown() { return m_shift; } @@ -1714,6 +1754,7 @@ protected: int m_col; int m_x; int m_y; + bool m_selecting; bool m_control; bool m_meta; bool m_shift; @@ -1763,6 +1804,7 @@ public: { m_topLeft = wxGridNoCellCoords; m_bottomRight = wxGridNoCellCoords; + m_selecting = FALSE; m_control = FALSE; m_meta = FALSE; m_shift = FALSE; @@ -1772,6 +1814,7 @@ public: wxGridRangeSelectEvent(int id, wxEventType type, wxObject* obj, const wxGridCellCoords& topLeft, const wxGridCellCoords& bottomRight, + bool sel = TRUE, bool control=FALSE, bool shift=FALSE, bool alt=FALSE, bool meta=FALSE); @@ -1781,6 +1824,7 @@ public: int GetBottomRow() { return m_bottomRight.GetRow(); } int GetLeftCol() { return m_topLeft.GetCol(); } int GetRightCol() { return m_bottomRight.GetCol(); } + bool Selecting() { return m_selecting; } bool ControlDown() { return m_control; } bool MetaDown() { return m_meta; } bool ShiftDown() { return m_shift; } @@ -1789,6 +1833,7 @@ public: protected: wxGridCellCoords m_topLeft; wxGridCellCoords m_bottomRight; + bool m_selecting; bool m_control; bool m_meta; bool m_shift; @@ -1851,4 +1896,3 @@ const wxEventType wxEVT_GRID_CHANGE_SEL_LABEL = wxEVT_FIRST + 1578; #endif // #ifndef __WXGRID_H__ #endif // ifndef wxUSE_NEW_GRID -