X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57bd4c6031d438f11af0ec540136f49a928b923c..55fbde1232bff0ed44c23775911574ac1b2f8a0a:/src/generic/datavgen.cpp diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 7d404f3e72..3ca5d64b87 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -2,6 +2,7 @@ // Name: src/generic/datavgen.cpp // Purpose: wxDataViewCtrl generic implementation // Author: Robert Roebling +// Modified by: Francesco Montorsi, Guru Kathiresan, Otto Wyss // Id: $Id$ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence @@ -22,19 +23,25 @@ #ifndef WX_PRECOMP #ifdef __WXMSW__ + #include "wx/msw/private.h" #include "wx/msw/wrapwin.h" + #include "wx/msw/wrapcctl.h" // include "properly" #endif #include "wx/sizer.h" #include "wx/log.h" #include "wx/dcclient.h" #include "wx/timer.h" #include "wx/settings.h" + #include "wx/msgdlg.h" + #include "wx/dcscreen.h" #endif #include "wx/stockitem.h" #include "wx/calctrl.h" #include "wx/popupwin.h" #include "wx/renderer.h" +#include "wx/dcbuffer.h" +#include "wx/icon.h" //----------------------------------------------------------------------------- // classes @@ -42,36 +49,191 @@ class wxDataViewCtrl; +static const int SCROLL_UNIT_X = 15; + +// the cell padding on the left/right +static const int PADDING_RIGHTLEFT = 3; + +// the cell padding on the top/bottom +static const int PADDING_TOPBOTTOM = 1; + +// the expander space margin +static const int EXPANDER_MARGIN = 4; + //----------------------------------------------------------------------------- // wxDataViewHeaderWindow //----------------------------------------------------------------------------- -class wxDataViewHeaderWindow: public wxWindow +#define USE_NATIVE_HEADER_WINDOW 1 + +// NB: for some reason, this class must be dllexport'ed or we get warnings from +// MSVC in DLL build +class WXDLLIMPEXP_ADV wxDataViewHeaderWindowBase : public wxControl { public: - wxDataViewHeaderWindow( wxDataViewCtrl *parent, - wxWindowID id, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - const wxString &name = wxT("wxdataviewctrlheaderwindow") ); - virtual ~wxDataViewHeaderWindow(); + wxDataViewHeaderWindowBase() + { m_owner = NULL; } + + bool Create(wxDataViewCtrl *parent, wxWindowID id, + const wxPoint &pos, const wxSize &size, + const wxString &name) + { + return wxWindow::Create(parent, id, pos, size, wxNO_BORDER, name); + } void SetOwner( wxDataViewCtrl* owner ) { m_owner = owner; } wxDataViewCtrl *GetOwner() { return m_owner; } + // called on column addition/removal + virtual void UpdateDisplay() { /* by default, do nothing */ } + + // returns the n-th column + virtual wxDataViewColumn *GetColumn(unsigned int n) + { + wxASSERT(m_owner); + wxDataViewColumn *ret = m_owner->GetColumn(n); + wxASSERT(ret); + + return ret; + } + +protected: + wxDataViewCtrl *m_owner; + + // sends an event generated from the n-th wxDataViewColumn + void SendEvent(wxEventType type, unsigned int n); +}; + +// on wxMSW the header window (only that part however) can be made native! +#if defined(__WXMSW__) && USE_NATIVE_HEADER_WINDOW + +#define COLUMN_WIDTH_OFFSET 2 +#define wxDataViewHeaderWindowMSW wxDataViewHeaderWindow + +class wxDataViewHeaderWindowMSW : public wxDataViewHeaderWindowBase +{ +public: + + wxDataViewHeaderWindowMSW( wxDataViewCtrl *parent, + wxWindowID id, + const wxPoint &pos = wxDefaultPosition, + const wxSize &size = wxDefaultSize, + const wxString &name = wxT("wxdataviewctrlheaderwindow") ) + { + Create(parent, id, pos, size, name); + } + + bool Create(wxDataViewCtrl *parent, wxWindowID id, + const wxPoint &pos, const wxSize &size, + const wxString &name); + + ~wxDataViewHeaderWindowMSW(); + + // called when any column setting is changed and/or changed + // the column count + virtual void UpdateDisplay(); + + // called when the main window gets scrolled + virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL); + +protected: + virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); + virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags); + + unsigned int GetColumnIdxFromHeader(NMHEADER *nmHDR); + + wxDataViewColumn *GetColumnFromHeader(NMHEADER *nmHDR) + { return GetColumn(GetColumnIdxFromHeader(nmHDR)); } + +private: + DECLARE_DYNAMIC_CLASS(wxDataViewHeaderWindowMSW) +}; + +#else // !defined(__WXMSW__) + +#define HEADER_WINDOW_HEIGHT 25 +#define HEADER_HORIZ_BORDER 5 +#define HEADER_VERT_BORDER 3 +#define wxGenericDataViewHeaderWindow wxDataViewHeaderWindow + +class wxGenericDataViewHeaderWindow : public wxDataViewHeaderWindowBase +{ +public: + wxGenericDataViewHeaderWindow( wxDataViewCtrl *parent, + wxWindowID id, + const wxPoint &pos = wxDefaultPosition, + const wxSize &size = wxDefaultSize, + const wxString &name = wxT("wxdataviewctrlheaderwindow") ) + { + Init(); + Create(parent, id, pos, size, name); + } + + bool Create(wxDataViewCtrl *parent, wxWindowID id, + const wxPoint &pos, const wxSize &size, + const wxString &name); + + ~wxGenericDataViewHeaderWindow() + { + delete m_resizeCursor; + } + + virtual void UpdateDisplay() { Refresh(); } + + // event handlers: + void OnPaint( wxPaintEvent &event ); void OnMouse( wxMouseEvent &event ); void OnSetFocus( wxFocusEvent &event ); -private: - wxDataViewCtrl *m_owner; + +protected: + + // vars used for column resizing: + wxCursor *m_resizeCursor; + const wxCursor *m_currentCursor; + bool m_isDragging; + + bool m_dirty; // needs refresh? + int m_column; // index of the column being resized + int m_currentX; // divider line position in logical (unscrolled) coords + int m_minX; // minimal position beyond which the divider line + // can't be dragged in logical coords + + // the pen used to draw the current column width drag line + // when resizing the columsn + wxPen m_penCurrent; + + + // internal utilities: + + void Init() + { + m_currentCursor = (wxCursor *) NULL; + m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE ); + + m_isDragging = false; + m_dirty = false; + + m_column = wxNOT_FOUND; + m_currentX = 0; + m_minX = 0; + + wxColour col = wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT); + m_penCurrent = wxPen(col, 1, wxSOLID); + } + + void DrawCurrent(); + void AdjustDC(wxDC& dc); private: - DECLARE_DYNAMIC_CLASS(wxDataViewHeaderWindow) + DECLARE_DYNAMIC_CLASS(wxGenericDataViewHeaderWindow) DECLARE_EVENT_TABLE() }; +#endif // defined(__WXMSW__) + //----------------------------------------------------------------------------- // wxDataViewRenameTimer //----------------------------------------------------------------------------- @@ -87,49 +249,69 @@ public: }; //----------------------------------------------------------------------------- -// wxDataViewTextCtrlWrapper: wraps a wxTextCtrl for inline editing +// wxDataViewTreeNode //----------------------------------------------------------------------------- +class wxDataViewTreeNode; +WX_DEFINE_ARRAY_PTR( wxDataViewTreeNode *, wxDataViewTreeNodes ); -class wxDataViewTextCtrlWrapper : public wxEvtHandler +class wxDataViewTreeNode { public: - // NB: text must be a valid object but not Create()d yet - wxDataViewTextCtrlWrapper( wxDataViewMainWindow *owner, - wxTextCtrl *text, - wxDataViewListModel *model, - size_t col, size_t row, - wxRect cellLabel ); - - wxTextCtrl *GetText() const { return m_text; } - - void AcceptChangesAndFinish(); - -protected: - void OnChar( wxKeyEvent &event ); - void OnKeyUp( wxKeyEvent &event ); - void OnKillFocus( wxFocusEvent &event ); - - bool AcceptChanges(); - void Finish(); + wxDataViewTreeNode( wxDataViewTreeNode * parent ) + { this->parent = parent; + if( parent == NULL ) + open = true; + else + open = false; + hasChildren = false; + } + //I don't know what I need to do in the destructure + ~wxDataViewTreeNode() + { } + + wxDataViewTreeNode * GetParent() { return parent; } + void SetParent( wxDataViewTreeNode * parent ) { this->parent = parent; } + wxDataViewTreeNodes & GetChildren() { return children; } + void SetChildren( wxDataViewTreeNodes children ) { this->children = children; } + + wxDataViewTreeNode * GetChild( unsigned int n ) { return children.Item( n ); } + void InsertChild( wxDataViewTreeNode * child, unsigned int n) { children.Insert( child, n); } + void AppendChild( wxDataViewTreeNode * child ) { children.Add( child ); } + + wxDataViewItem & GetItem() { return item; } + void SetItem( wxDataViewItem & item ) { this->item = item; } + + unsigned int GetChildrenNumber() { return children.GetCount(); } + int GetIndentLevel() + { + int ret = 0 ; + wxDataViewTreeNode * node = this; + while( node->GetParent()->GetParent() != NULL ) + { + node = node->GetParent(); + ret ++; + } + return ret; + } + bool IsOpen() { return open; } + void ToggleOpen(){ open = !open; } + bool HasChildren() { return hasChildren; } + void SetHasChildren( bool has ){ hasChildren = has; } private: - wxDataViewMainWindow *m_owner; - wxTextCtrl *m_text; - wxString m_startValue; - wxDataViewListModel *m_model; - size_t m_col; - size_t m_row; - bool m_finished; - bool m_aboutToFinish; - - DECLARE_EVENT_TABLE() + wxDataViewTreeNode * parent; + wxDataViewTreeNodes children; + wxDataViewItem item; + bool open; + bool hasChildren; }; //----------------------------------------------------------------------------- // wxDataViewMainWindow //----------------------------------------------------------------------------- -WX_DEFINE_SORTED_ARRAY_SIZE_T( size_t, wxDataViewSelection ); +WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_SIZE_T(unsigned int, wxDataViewSelection, + WXDLLIMPEXP_ADV); class wxDataViewMainWindow: public wxWindow { @@ -141,21 +323,19 @@ public: const wxString &name = wxT("wxdataviewctrlmainwindow") ); virtual ~wxDataViewMainWindow(); - // notifications from wxDataViewListModel - bool RowAppended(); - bool RowPrepended(); - bool RowInserted( size_t before ); - bool RowDeleted( size_t row ); - bool RowChanged( size_t row ); - bool ValueChanged( size_t col, size_t row ); - bool RowsReordered( size_t *new_order ); + // notifications from wxDataViewModel + bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ); + bool ItemDeleted( const wxDataViewItem &item ); + bool ItemChanged( const wxDataViewItem &item ); + bool ValueChanged( const wxDataViewItem &item, unsigned int col ); bool Cleared(); void SetOwner( wxDataViewCtrl* owner ) { m_owner = owner; } wxDataViewCtrl *GetOwner() { return m_owner; } + const wxDataViewCtrl *GetOwner() const { return m_owner; } void OnPaint( wxPaintEvent &event ); - void OnArrowChar(size_t newCurrent, const wxKeyEvent& event); + void OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event); void OnChar( wxKeyEvent &event ); void OnMouse( wxMouseEvent &event ); void OnSetFocus( wxFocusEvent &event ); @@ -166,31 +346,60 @@ public: void OnInternalIdle(); void OnRenameTimer(); - void FinishEditing( wxTextCtrl *text ); - void ScrollWindow( int dx, int dy, const wxRect *rect ); + void ScrollWindow( int dx, int dy, const wxRect *rect = NULL ); - bool HasCurrentRow() { return m_currentRow != (size_t)-1; } - void ChangeCurrentRow( size_t row ); + bool HasCurrentRow() { return m_currentRow != (unsigned int)-1; } + void ChangeCurrentRow( unsigned int row ); - bool IsSingleSel() const { return !GetParent()->HasFlag(wxDV_MULTIPLE); }; + bool IsSingleSel() const { return !GetParent()->HasFlag(wxDV_MULTIPLE); } bool IsEmpty() { return GetRowCount() == 0; } - int GetCountPerPage(); - int GetEndOfLastCol(); - size_t GetFirstVisibleRow(); - size_t GetLastVisibleRow(); - size_t GetRowCount(); + int GetCountPerPage() const; + int GetEndOfLastCol() const; + unsigned int GetFirstVisibleRow() const; + //I change this method to un const because in the tree view, the displaying number of the tree are changing along with the expanding/collapsing of the tree nodes + unsigned int GetLastVisibleRow(); + unsigned int GetRowCount() ; + + wxDataViewItem GetSelection(); + void Select( const wxArrayInt& aSelections ); void SelectAllRows( bool on ); - void SelectRow( size_t row, bool on ); - void SelectRows( size_t from, size_t to, bool on ); - void ReverseRowSelection( size_t row ); - bool IsRowSelected( size_t row ); + void SelectRow( unsigned int row, bool on ); + void SelectRows( unsigned int from, unsigned int to, bool on ); + void ReverseRowSelection( unsigned int row ); + bool IsRowSelected( unsigned int row ); - void RefreshRow( size_t row ); - void RefreshRows( size_t from, size_t to ); - void RefreshRowsAfter( size_t firstRow ); + void RefreshRow( unsigned int row ); + void RefreshRows( unsigned int from, unsigned int to ); + void RefreshRowsAfter( unsigned int firstRow ); + + // returns the colour to be used for drawing the rules + wxColour GetRuleColour() const + { + return wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT); + } + + //void EnsureVisible( unsigned int row ); + wxRect GetLineRect( unsigned int row ) const; + + //Some useful functions for row and item mapping + wxDataViewItem GetItemByRow( unsigned int row ); + unsigned int GetRowByItem( const wxDataViewItem & item ); + + //Methods for building the mapping tree + void BuildTree( wxDataViewModel * model ); + void DestroyTree(); +private: + wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row ); + //We did not need this temporarily + //wxDataViewTreeNode * GetTreeNodeByItem( const wxDataViewItem & item ); + + int RecalculateCount() ; + + void OnExpanding( unsigned int row ); + void OnCollapsing( unsigned int row ); private: wxDataViewCtrl *m_owner; @@ -198,11 +407,10 @@ private: bool m_dirty; wxDataViewColumn *m_currentCol; - size_t m_currentRow; + unsigned int m_currentRow; wxDataViewSelection m_selection; wxDataViewRenameTimer *m_renameTimer; - wxDataViewTextCtrlWrapper *m_textctrlWrapper; bool m_lastOnSame; bool m_hasFocus; @@ -211,39 +419,42 @@ private: wxPoint m_dragStart; // for double click logic - size_t m_lineLastClicked, + unsigned int m_lineLastClicked, m_lineBeforeLastClicked, m_lineSelectSingleOnUp; + // the pen used to draw horiz/vertical rules + wxPen m_penRule; + + // the pen used to draw the expander and the lines + wxPen m_penExpander; + + //This is the tree structure of the model + wxDataViewTreeNode * m_root; + int m_count; private: DECLARE_DYNAMIC_CLASS(wxDataViewMainWindow) DECLARE_EVENT_TABLE() }; // --------------------------------------------------------- -// wxGenericDataViewListModelNotifier +// wxGenericDataViewModelNotifier // --------------------------------------------------------- -class wxGenericDataViewListModelNotifier: public wxDataViewListModelNotifier +class wxGenericDataViewModelNotifier: public wxDataViewModelNotifier { public: - wxGenericDataViewListModelNotifier( wxDataViewMainWindow *mainWindow ) + wxGenericDataViewModelNotifier( wxDataViewMainWindow *mainWindow ) { m_mainWindow = mainWindow; } - virtual bool RowAppended() - { return m_mainWindow->RowAppended(); } - virtual bool RowPrepended() - { return m_mainWindow->RowPrepended(); } - virtual bool RowInserted( size_t before ) - { return m_mainWindow->RowInserted( before ); } - virtual bool RowDeleted( size_t row ) - { return m_mainWindow->RowDeleted( row ); } - virtual bool RowChanged( size_t row ) - { return m_mainWindow->RowChanged( row ); } - virtual bool ValueChanged( size_t col, size_t row ) - { return m_mainWindow->ValueChanged( col, row ); } - virtual bool RowsReordered( size_t *new_order ) - { return m_mainWindow->RowsReordered( new_order ); } + virtual bool ItemAdded( const wxDataViewItem & parent, const wxDataViewItem & item ) + { return m_mainWindow->ItemAdded( parent , item ); } + virtual bool ItemDeleted( const wxDataViewItem & item ) + { return m_mainWindow->ItemDeleted( item ); } + virtual bool ItemChanged( const wxDataViewItem & item ) + { return m_mainWindow->ItemChanged(item); } + virtual bool ValueChanged( const wxDataViewItem & item , unsigned int col ) + { return m_mainWindow->ValueChanged( item, col ); } virtual bool Cleared() { return m_mainWindow->Cleared(); } @@ -251,24 +462,28 @@ public: }; // --------------------------------------------------------- -// wxDataViewCell +// wxDataViewRenderer // --------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxDataViewCell, wxDataViewCellBase) +IMPLEMENT_ABSTRACT_CLASS(wxDataViewRenderer, wxDataViewRendererBase) -wxDataViewCell::wxDataViewCell( const wxString &varianttype, wxDataViewCellMode mode ) : - wxDataViewCellBase( varianttype, mode ) +wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, + wxDataViewCellMode mode, + int align) : + wxDataViewRendererBase( varianttype, mode, align ) { m_dc = NULL; + m_align = align; + m_mode = mode; } -wxDataViewCell::~wxDataViewCell() +wxDataViewRenderer::~wxDataViewRenderer() { if (m_dc) delete m_dc; } -wxDC *wxDataViewCell::GetDC() +wxDC *wxDataViewRenderer::GetDC() { if (m_dc == NULL) { @@ -283,78 +498,159 @@ wxDC *wxDataViewCell::GetDC() } // --------------------------------------------------------- -// wxDataViewCustomCell +// wxDataViewCustomRenderer // --------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomCell, wxDataViewCell) +IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer) -wxDataViewCustomCell::wxDataViewCustomCell( const wxString &varianttype, - wxDataViewCellMode mode ) : - wxDataViewCell( varianttype, mode ) +wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype, + wxDataViewCellMode mode, int align ) : + wxDataViewRenderer( varianttype, mode, align ) { } // --------------------------------------------------------- -// wxDataViewTextCell +// wxDataViewTextRenderer // --------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxDataViewTextCell, wxDataViewCustomCell) +IMPLEMENT_CLASS(wxDataViewTextRenderer, wxDataViewCustomRenderer) -wxDataViewTextCell::wxDataViewTextCell( const wxString &varianttype, wxDataViewCellMode mode ) : - wxDataViewCustomCell( varianttype, mode ) +wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, + wxDataViewCellMode mode, int align ) : + wxDataViewCustomRenderer( varianttype, mode, align ) { } -bool wxDataViewTextCell::SetValue( const wxVariant &value ) +bool wxDataViewTextRenderer::SetValue( const wxVariant &value ) { m_text = value.GetString(); return true; } -bool wxDataViewTextCell::GetValue( wxVariant& WXUNUSED(value) ) +bool wxDataViewTextRenderer::GetValue( wxVariant& WXUNUSED(value) ) const { return false; } -bool wxDataViewTextCell::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) +bool wxDataViewTextRenderer::HasEditorCtrl() +{ + return true; +} + +wxControl* wxDataViewTextRenderer::CreateEditorCtrl( wxWindow *parent, + wxRect labelRect, const wxVariant &value ) +{ + return new wxTextCtrl( parent, wxID_ANY, value, + wxPoint(labelRect.x,labelRect.y), + wxSize(labelRect.width,labelRect.height) ); +} + +bool wxDataViewTextRenderer::GetValueFromEditorCtrl( wxControl *editor, wxVariant &value ) +{ + wxTextCtrl *text = (wxTextCtrl*) editor; + value = text->GetValue(); + return true; +} + +bool wxDataViewTextRenderer::Render( wxRect cell, wxDC *dc, int state ) { + wxDataViewCtrl *view = GetOwner()->GetOwner(); + wxColour col = (state & wxDATAVIEW_CELL_SELECTED) ? + wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) : + view->GetForegroundColour(); + + dc->SetTextForeground(col); dc->DrawText( m_text, cell.x, cell.y ); return true; } -wxSize wxDataViewTextCell::GetSize() +wxSize wxDataViewTextRenderer::GetSize() const { + const wxDataViewCtrl *view = GetView(); + if (!m_text.empty()) + { + int x,y; + view->GetTextExtent( m_text, &x, &y ); + return wxSize( x, y ); + } return wxSize(80,20); } // --------------------------------------------------------- -// wxDataViewToggleCell +// wxDataViewBitmapRenderer // --------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleCell, wxDataViewCustomCell) +IMPLEMENT_CLASS(wxDataViewBitmapRenderer, wxDataViewCustomRenderer) + +wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype, + wxDataViewCellMode mode, int align ) : + wxDataViewCustomRenderer( varianttype, mode, align ) +{ +} + +bool wxDataViewBitmapRenderer::SetValue( const wxVariant &value ) +{ + if (value.GetType() == wxT("wxBitmap")) + m_bitmap << value; + if (value.GetType() == wxT("wxIcon")) + m_icon << value; + + return true; +} + +bool wxDataViewBitmapRenderer::GetValue( wxVariant& WXUNUSED(value) ) const +{ + return false; +} -wxDataViewToggleCell::wxDataViewToggleCell( const wxString &varianttype, - wxDataViewCellMode mode ) : - wxDataViewCustomCell( varianttype, mode ) +bool wxDataViewBitmapRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) +{ + if (m_bitmap.Ok()) + dc->DrawBitmap( m_bitmap, cell.x, cell.y ); + else if (m_icon.Ok()) + dc->DrawIcon( m_icon, cell.x, cell.y ); + + return true; +} + +wxSize wxDataViewBitmapRenderer::GetSize() const +{ + if (m_bitmap.Ok()) + return wxSize( m_bitmap.GetWidth(), m_bitmap.GetHeight() ); + else if (m_icon.Ok()) + return wxSize( m_icon.GetWidth(), m_icon.GetHeight() ); + + return wxSize(16,16); +} + +// --------------------------------------------------------- +// wxDataViewToggleRenderer +// --------------------------------------------------------- + +IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleRenderer, wxDataViewCustomRenderer) + +wxDataViewToggleRenderer::wxDataViewToggleRenderer( const wxString &varianttype, + wxDataViewCellMode mode, int align ) : + wxDataViewCustomRenderer( varianttype, mode, align ) { m_toggle = false; } -bool wxDataViewToggleCell::SetValue( const wxVariant &value ) +bool wxDataViewToggleRenderer::SetValue( const wxVariant &value ) { m_toggle = value.GetBool(); return true; } -bool wxDataViewToggleCell::GetValue( wxVariant &WXUNUSED(value) ) +bool wxDataViewToggleRenderer::GetValue( wxVariant &WXUNUSED(value) ) const { return false; } -bool wxDataViewToggleCell::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) +bool wxDataViewToggleRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) { // User wxRenderer here @@ -379,39 +675,41 @@ bool wxDataViewToggleCell::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) return true; } -bool wxDataViewToggleCell::Activate( wxRect WXUNUSED(cell), wxDataViewListModel *model, size_t col, size_t row ) +bool wxDataViewToggleRenderer::Activate( wxRect WXUNUSED(cell), + wxDataViewModel *model, + const wxDataViewItem & item, unsigned int col) { bool value = !m_toggle; wxVariant variant = value; - model->SetValue( variant, col, row ); - model->ValueChanged( col, row ); + model->SetValue( variant, item, col); + model->ValueChanged( item, col ); return true; } -wxSize wxDataViewToggleCell::GetSize() +wxSize wxDataViewToggleRenderer::GetSize() const { return wxSize(20,20); } // --------------------------------------------------------- -// wxDataViewProgressCell +// wxDataViewProgressRenderer // --------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressCell, wxDataViewCustomCell) +IMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressRenderer, wxDataViewCustomRenderer) -wxDataViewProgressCell::wxDataViewProgressCell( const wxString &label, - const wxString &varianttype, wxDataViewCellMode mode ) : - wxDataViewCustomCell( varianttype, mode ) +wxDataViewProgressRenderer::wxDataViewProgressRenderer( const wxString &label, + const wxString &varianttype, wxDataViewCellMode mode, int align ) : + wxDataViewCustomRenderer( varianttype, mode, align ) { m_label = label; m_value = 0; } -wxDataViewProgressCell::~wxDataViewProgressCell() +wxDataViewProgressRenderer::~wxDataViewProgressRenderer() { } -bool wxDataViewProgressCell::SetValue( const wxVariant &value ) +bool wxDataViewProgressRenderer::SetValue( const wxVariant &value ) { m_value = (long) value; @@ -421,7 +719,13 @@ bool wxDataViewProgressCell::SetValue( const wxVariant &value ) return true; } -bool wxDataViewProgressCell::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) +bool wxDataViewProgressRenderer::GetValue( wxVariant &value ) const +{ + value = (long) m_value; + return true; +} + +bool wxDataViewProgressRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) { double pct = (double)m_value / 100.0; wxRect bar = cell; @@ -437,25 +741,29 @@ bool wxDataViewProgressCell::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) return true; } -wxSize wxDataViewProgressCell::GetSize() +wxSize wxDataViewProgressRenderer::GetSize() const { return wxSize(40,12); } // --------------------------------------------------------- -// wxDataViewDateCell +// wxDataViewDateRenderer // --------------------------------------------------------- -class wxDataViewDateCellPopupTransient: public wxPopupTransientWindow +#define wxUSE_DATE_RENDERER_POPUP (wxUSE_CALENDARCTRL && wxUSE_POPUPWIN) + +#if wxUSE_DATE_RENDERER_POPUP + +class wxDataViewDateRendererPopupTransient: public wxPopupTransientWindow { public: - wxDataViewDateCellPopupTransient( wxWindow* parent, wxDateTime *value, - wxDataViewListModel *model, size_t col, size_t row ) : - wxPopupTransientWindow( parent, wxBORDER_SIMPLE ) + wxDataViewDateRendererPopupTransient( wxWindow* parent, wxDateTime *value, + wxDataViewModel *model, const wxDataViewItem & item, unsigned int col) : + wxPopupTransientWindow( parent, wxBORDER_SIMPLE ), + m_item( item ) { m_model = model; m_col = col; - m_row = row; m_cal = new wxCalendarCtrl( this, wxID_ANY, *value ); wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL ); sizer->Add( m_cal, 1, wxGROW ); @@ -466,9 +774,9 @@ public: void OnCalendar( wxCalendarEvent &event ); wxCalendarCtrl *m_cal; - wxDataViewListModel *m_model; - size_t m_col; - size_t m_row; + wxDataViewModel *m_model; + unsigned int m_col; + const wxDataViewItem & m_item; protected: virtual void OnDismiss() @@ -479,35 +787,43 @@ private: DECLARE_EVENT_TABLE() }; -BEGIN_EVENT_TABLE(wxDataViewDateCellPopupTransient,wxPopupTransientWindow) - EVT_CALENDAR( wxID_ANY, wxDataViewDateCellPopupTransient::OnCalendar ) +BEGIN_EVENT_TABLE(wxDataViewDateRendererPopupTransient,wxPopupTransientWindow) + EVT_CALENDAR( wxID_ANY, wxDataViewDateRendererPopupTransient::OnCalendar ) END_EVENT_TABLE() -void wxDataViewDateCellPopupTransient::OnCalendar( wxCalendarEvent &event ) +void wxDataViewDateRendererPopupTransient::OnCalendar( wxCalendarEvent &event ) { wxDateTime date = event.GetDate(); wxVariant value = date; - m_model->SetValue( value, m_col, m_row ); - m_model->ValueChanged( m_col, m_row ); + m_model->SetValue( value, m_item, m_col ); + m_model->ValueChanged( m_item, m_col ); DismissAndNotify(); } -IMPLEMENT_ABSTRACT_CLASS(wxDataViewDateCell, wxDataViewCustomCell) +#endif // wxUSE_DATE_RENDERER_POPUP -wxDataViewDateCell::wxDataViewDateCell( const wxString &varianttype, - wxDataViewCellMode mode ) : - wxDataViewCustomCell( varianttype, mode ) +IMPLEMENT_ABSTRACT_CLASS(wxDataViewDateRenderer, wxDataViewCustomRenderer) + +wxDataViewDateRenderer::wxDataViewDateRenderer( const wxString &varianttype, + wxDataViewCellMode mode, int align ) : + wxDataViewCustomRenderer( varianttype, mode, align ) { } -bool wxDataViewDateCell::SetValue( const wxVariant &value ) +bool wxDataViewDateRenderer::SetValue( const wxVariant &value ) { m_date = value.GetDateTime(); return true; } -bool wxDataViewDateCell::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) +bool wxDataViewDateRenderer::GetValue( wxVariant &value ) const +{ + value = m_date; + return true; +} + +bool wxDataViewDateRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) { dc->SetFont( GetOwner()->GetOwner()->GetFont() ); wxString tmp = m_date.FormatDate(); @@ -516,28 +832,32 @@ bool wxDataViewDateCell::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) return true; } -wxSize wxDataViewDateCell::GetSize() +wxSize wxDataViewDateRenderer::GetSize() const { - wxDataViewCtrl* view = GetOwner()->GetOwner(); + const wxDataViewCtrl* view = GetView(); wxString tmp = m_date.FormatDate(); wxCoord x,y,d; view->GetTextExtent( tmp, &x, &y, &d ); return wxSize(x,y+d); } -bool wxDataViewDateCell::Activate( wxRect WXUNUSED(cell), wxDataViewListModel *model, size_t col, size_t row ) +bool wxDataViewDateRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewModel *model, + const wxDataViewItem & item, unsigned int col ) { wxVariant variant; - model->GetValue( variant, col, row ); + model->GetValue( variant, item, col ); wxDateTime value = variant.GetDateTime(); - wxDataViewDateCellPopupTransient *popup = new wxDataViewDateCellPopupTransient( - GetOwner()->GetOwner()->GetParent(), &value, model, col, row ); +#if wxUSE_DATE_RENDERER_POPUP + wxDataViewDateRendererPopupTransient *popup = new wxDataViewDateRendererPopupTransient( + GetOwner()->GetOwner()->GetParent(), &value, model, item, col); wxPoint pos = wxGetMousePosition(); popup->Move( pos ); popup->Layout(); popup->Popup( popup->m_cal ); - +#else // !wxUSE_DATE_RENDERER_POPUP + wxMessageBox(value.Format()); +#endif // wxUSE_DATE_RENDERER_POPUP/!wxUSE_DATE_RENDERER_POPUP return true; } @@ -547,85 +867,481 @@ bool wxDataViewDateCell::Activate( wxRect WXUNUSED(cell), wxDataViewListModel *m IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumn, wxDataViewColumnBase) -wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewCell *cell, size_t model_column, - int fixed_width, wxDataViewColumnSizing sizing, int flags ) : - wxDataViewColumnBase( title, cell, model_column, flags ) +wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *cell, + unsigned int model_column, + int width, wxAlignment align, int flags ) : + wxDataViewColumnBase( title, cell, model_column, width, align, flags ) +{ + SetAlignment(align); + SetTitle(title); + SetFlags(flags); + + Init(width < 0 ? wxDVC_DEFAULT_WIDTH : width); +} + +wxDataViewColumn::wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *cell, + unsigned int model_column, + int width, wxAlignment align, int flags ) : + wxDataViewColumnBase( bitmap, cell, model_column, width, align, flags ) { - m_sizing = sizing; + SetAlignment(align); + SetFlags(flags); - m_width = fixed_width; - m_fixedWidth = fixed_width; + Init(width < 0 ? wxDVC_TOGGLE_DEFAULT_WIDTH : width); } wxDataViewColumn::~wxDataViewColumn() { } -void wxDataViewColumn::SetTitle( const wxString &title ) +void wxDataViewColumn::Init( int width ) +{ + m_width = width; + m_minWidth = wxDVC_DEFAULT_MINWIDTH; + m_ascending = true; +} + +void wxDataViewColumn::SetResizeable( bool resizeable ) +{ + if (resizeable) + m_flags |= wxDATAVIEW_COL_RESIZABLE; + else + m_flags &= ~wxDATAVIEW_COL_RESIZABLE; +} + +void wxDataViewColumn::SetHidden( bool hidden ) { - wxDataViewColumnBase::SetTitle( title ); + if (hidden) + m_flags |= wxDATAVIEW_COL_HIDDEN; + else + m_flags &= ~wxDATAVIEW_COL_HIDDEN; + // tell our owner to e.g. update its scrollbars: + if (GetOwner()) + GetOwner()->OnColumnChange(); } -int wxDataViewColumn::GetWidth() +void wxDataViewColumn::SetSortable( bool sortable ) { - return m_width; + if (sortable) + m_flags |= wxDATAVIEW_COL_SORTABLE; + else + m_flags &= ~wxDATAVIEW_COL_SORTABLE; + + // Update header button + if (GetOwner()) + GetOwner()->OnColumnChange(); } -void wxDataViewColumn::SetFixedWidth( int width ) +void wxDataViewColumn::SetSortOrder( bool ascending ) { - m_fixedWidth = width; + m_ascending = ascending; + + // Update header button + if (GetOwner()) + GetOwner()->OnColumnChange(); +} - if (m_sizing == wxDATAVIEW_COL_WIDTH_FIXED) - { - m_width = width; - // Set dirty - } +bool wxDataViewColumn::IsSortOrderAscending() const +{ + return m_ascending; +} + +void wxDataViewColumn::SetInternalWidth( int width ) +{ + m_width = width; + + // the scrollbars of the wxDataViewCtrl needs to be recalculated! + if (m_owner && m_owner->m_clientArea) + m_owner->m_clientArea->RecalculateDisplay(); } -int wxDataViewColumn::GetFixedWidth() +void wxDataViewColumn::SetWidth( int width ) { - return m_fixedWidth; + m_owner->m_headerArea->UpdateDisplay(); + + SetInternalWidth(width); } + //----------------------------------------------------------------------------- -// wxDataViewHeaderWindow +// wxDataViewHeaderWindowBase //----------------------------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxDataViewHeaderWindow, wxWindow) +void wxDataViewHeaderWindowBase::SendEvent(wxEventType type, unsigned int n) +{ + wxWindow *parent = GetParent(); + wxDataViewEvent le(type, parent->GetId()); + + le.SetEventObject(parent); + le.SetColumn(n); + le.SetDataViewColumn(GetColumn(n)); + le.SetModel(GetOwner()->GetModel()); + + // for events created by wxDataViewHeaderWindow the + // row / value fields are not valid + + parent->GetEventHandler()->ProcessEvent(le); +} -BEGIN_EVENT_TABLE(wxDataViewHeaderWindow,wxWindow) - EVT_PAINT (wxDataViewHeaderWindow::OnPaint) - EVT_MOUSE_EVENTS (wxDataViewHeaderWindow::OnMouse) - EVT_SET_FOCUS (wxDataViewHeaderWindow::OnSetFocus) +#if defined(__WXMSW__) && USE_NATIVE_HEADER_WINDOW + +// implemented in msw/listctrl.cpp: +int WXDLLIMPEXP_CORE wxMSWGetColumnClicked(NMHDR *nmhdr, POINT *ptClick); + +IMPLEMENT_ABSTRACT_CLASS(wxDataViewHeaderWindowMSW, wxWindow) + +bool wxDataViewHeaderWindowMSW::Create( wxDataViewCtrl *parent, wxWindowID id, + const wxPoint &pos, const wxSize &size, + const wxString &name ) +{ + m_owner = parent; + + if ( !CreateControl(parent, id, pos, size, 0, wxDefaultValidator, name) ) + return false; + + int x = pos.x == wxDefaultCoord ? 0 : pos.x, + y = pos.y == wxDefaultCoord ? 0 : pos.y, + w = size.x == wxDefaultCoord ? 1 : size.x, + h = size.y == wxDefaultCoord ? 22 : size.y; + + // create the native WC_HEADER window: + WXHWND hwndParent = (HWND)parent->GetHandle(); + WXDWORD msStyle = WS_CHILD | HDS_BUTTONS | HDS_HORZ | HDS_HOTTRACK | HDS_FULLDRAG; + m_hWnd = CreateWindowEx(0, + WC_HEADER, + (LPCTSTR) NULL, + msStyle, + x, y, w, h, + (HWND)hwndParent, + (HMENU)-1, + wxGetInstance(), + (LPVOID) NULL); + if (m_hWnd == NULL) + { + wxLogLastError(_T("CreateWindowEx")); + return false; + } + + // we need to subclass the m_hWnd to force wxWindow::HandleNotify + // to call wxDataViewHeaderWindow::MSWOnNotify + SubclassWin(m_hWnd); + + // the following is required to get the default win's font for + // header windows and must be done befor sending the HDM_LAYOUT msg + SetFont(GetFont()); + + RECT rcParent; + HDLAYOUT hdl; + WINDOWPOS wp; + + // Retrieve the bounding rectangle of the parent window's + // client area, and then request size and position values + // from the header control. + ::GetClientRect((HWND)hwndParent, &rcParent); + + hdl.prc = &rcParent; + hdl.pwpos = ℘ + if (!SendMessage((HWND)m_hWnd, HDM_LAYOUT, 0, (LPARAM) &hdl)) + { + wxLogLastError(_T("SendMessage")); + return false; + } + + // Set the size, position, and visibility of the header control. + SetWindowPos((HWND)m_hWnd, + wp.hwndInsertAfter, + wp.x, wp.y, + wp.cx, wp.cy, + wp.flags | SWP_SHOWWINDOW); + + // set our size hints: wxDataViewCtrl will put this wxWindow inside + // a wxBoxSizer and in order to avoid super-big header windows, + // we need to set our height as fixed + SetMinSize(wxSize(-1, wp.cy)); + SetMaxSize(wxSize(-1, wp.cy)); + + return true; +} + +wxDataViewHeaderWindowMSW::~wxDataViewHeaderWindow() +{ + UnsubclassWin(); +} + +void wxDataViewHeaderWindowMSW::UpdateDisplay() +{ + // remove old columns + for (int j=0, max=Header_GetItemCount((HWND)m_hWnd); j < max; j++) + Header_DeleteItem((HWND)m_hWnd, 0); + + // add the updated array of columns to the header control + unsigned int cols = GetOwner()->GetColumnCount(); + unsigned int added = 0; + for (unsigned int i = 0; i < cols; i++) + { + wxDataViewColumn *col = GetColumn( i ); + if (col->IsHidden()) + continue; // don't add it! + + HDITEM hdi; + hdi.mask = HDI_TEXT | HDI_FORMAT | HDI_WIDTH; + hdi.pszText = (wxChar *) col->GetTitle().wx_str(); + hdi.cxy = col->GetWidth(); + hdi.cchTextMax = sizeof(hdi.pszText)/sizeof(hdi.pszText[0]); + hdi.fmt = HDF_LEFT | HDF_STRING; + + // lParam is reserved for application's use: + // we store there the column index to use it later in MSWOnNotify + // (since columns may have been hidden) + hdi.lParam = (LPARAM)i; + + // the native wxMSW implementation of the header window + // draws the column separator COLUMN_WIDTH_OFFSET pixels + // on the right: to correct this effect we make the column + // exactly COLUMN_WIDTH_OFFSET wider (for the first column): + if (i == 0) + hdi.cxy += COLUMN_WIDTH_OFFSET; + + switch (col->GetAlignment()) + { + case wxALIGN_LEFT: + hdi.fmt |= HDF_LEFT; + break; + case wxALIGN_CENTER: + case wxALIGN_CENTER_HORIZONTAL: + hdi.fmt |= HDF_CENTER; + break; + case wxALIGN_RIGHT: + hdi.fmt |= HDF_RIGHT; + break; + + default: + // such alignment is not allowed for the column header! + wxFAIL; + } + + SendMessage((HWND)m_hWnd, HDM_INSERTITEM, + (WPARAM)added, (LPARAM)&hdi); + added++; + } +} + +unsigned int wxDataViewHeaderWindowMSW::GetColumnIdxFromHeader(NMHEADER *nmHDR) +{ + unsigned int idx; + + // NOTE: we don't just return nmHDR->iItem because when there are + // hidden columns, nmHDR->iItem may be different from + // nmHDR->pitem->lParam + + if (nmHDR->pitem && nmHDR->pitem->mask & HDI_LPARAM) + { + idx = (unsigned int)nmHDR->pitem->lParam; + return idx; + } + + HDITEM item; + item.mask = HDI_LPARAM; + Header_GetItem((HWND)m_hWnd, nmHDR->iItem, &item); + + return (unsigned int)item.lParam; +} + +bool wxDataViewHeaderWindowMSW::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) +{ + NMHDR *nmhdr = (NMHDR *)lParam; + + // is it a message from the header? + if ( nmhdr->hwndFrom != (HWND)m_hWnd ) + return wxWindow::MSWOnNotify(idCtrl, lParam, result); + + NMHEADER *nmHDR = (NMHEADER *)nmhdr; + switch ( nmhdr->code ) + { + case HDN_BEGINTRACK: + // user has started to resize a column: + // do we need to veto it? + if (!GetColumn(nmHDR->iItem)->IsResizeable()) + { + // veto it! + *result = TRUE; + } + break; + + case HDN_BEGINDRAG: + // user has started to reorder a column + break; + + case HDN_ITEMCHANGING: + if (nmHDR->pitem != NULL && + (nmHDR->pitem->mask & HDI_WIDTH) != 0) + { + int minWidth = GetColumnFromHeader(nmHDR)->GetMinWidth(); + if (nmHDR->pitem->cxy < minWidth) + { + // do not allow the user to resize this column under + // its minimal width: + *result = TRUE; + } + } + break; + + case HDN_ITEMCHANGED: // user is resizing a column + case HDN_ENDTRACK: // user has finished resizing a column + case HDN_ENDDRAG: // user has finished reordering a column + + // update the width of the modified column: + if (nmHDR->pitem != NULL && + (nmHDR->pitem->mask & HDI_WIDTH) != 0) + { + unsigned int idx = GetColumnIdxFromHeader(nmHDR); + unsigned int w = nmHDR->pitem->cxy; + wxDataViewColumn *col = GetColumn(idx); + + // see UpdateDisplay() for more info about COLUMN_WIDTH_OFFSET + if (idx == 0 && w > COLUMN_WIDTH_OFFSET) + w -= COLUMN_WIDTH_OFFSET; + + if (w >= (unsigned)col->GetMinWidth()) + col->SetInternalWidth(w); + } + break; + + case HDN_ITEMCLICK: + { + unsigned int idx = GetColumnIdxFromHeader(nmHDR); + wxEventType evt = nmHDR->iButton == 0 ? + wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK : + wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK; + SendEvent(evt, idx); + } + break; + + case NM_RCLICK: + { + // NOTE: for some reason (i.e. for a bug in Windows) + // the HDN_ITEMCLICK notification is not sent on + // right clicks, so we need to handle NM_RCLICK + + POINT ptClick; + int column = wxMSWGetColumnClicked(nmhdr, &ptClick); + if (column != wxNOT_FOUND) + { + HDITEM item; + item.mask = HDI_LPARAM; + Header_GetItem((HWND)m_hWnd, column, &item); + + // 'idx' may be different from 'column' if there are + // hidden columns... + unsigned int idx = (unsigned int)item.lParam; + SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, + idx); + } + } + break; + + case HDN_GETDISPINFOW: + // see wxListCtrl::MSWOnNotify for more info! + break; + + case HDN_ITEMDBLCLICK: + { + unsigned int idx = GetColumnIdxFromHeader(nmHDR); + int w = GetOwner()->GetBestColumnWidth(idx); + + // update the native control: + HDITEM hd; + ZeroMemory(&hd, sizeof(hd)); + hd.mask = HDI_WIDTH; + hd.cxy = w; + Header_SetItem(GetHwnd(), + nmHDR->iItem, // NOTE: we don't want 'idx' here! + &hd); + + // update the wxDataViewColumn class: + GetColumn(idx)->SetInternalWidth(w); + } + break; + + default: + return wxWindow::MSWOnNotify(idCtrl, lParam, result); + } + + return true; +} + +void wxDataViewHeaderWindowMSW::ScrollWindow(int WXUNUSED(dx), int WXUNUSED(dy), + const wxRect *WXUNUSED(rect)) +{ + wxSize ourSz = GetClientSize(); + wxSize ownerSz = m_owner->GetClientSize(); + + // where should the (logical) origin of this window be placed? + int x1 = 0, y1 = 0; + m_owner->CalcUnscrolledPosition(0, 0, &x1, &y1); + + // put this window on top of our parent and + SetWindowPos((HWND)m_hWnd, HWND_TOP, -x1, 0, + ownerSz.GetWidth() + x1, ourSz.GetHeight(), + SWP_SHOWWINDOW); +} + +void wxDataViewHeaderWindowMSW::DoSetSize(int WXUNUSED(x), int WXUNUSED(y), + int WXUNUSED(w), int WXUNUSED(h), + int WXUNUSED(f)) +{ + // the wxDataViewCtrl's internal wxBoxSizer will call this function when + // the wxDataViewCtrl window gets resized: the following dummy call + // to ScrollWindow() is required in order to get this header window + // correctly repainted when it's (horizontally) scrolled: + + ScrollWindow(0, 0); +} + +#else // !defined(__WXMSW__) + +IMPLEMENT_ABSTRACT_CLASS(wxGenericDataViewHeaderWindow, wxWindow) +BEGIN_EVENT_TABLE(wxGenericDataViewHeaderWindow, wxWindow) + EVT_PAINT (wxGenericDataViewHeaderWindow::OnPaint) + EVT_MOUSE_EVENTS (wxGenericDataViewHeaderWindow::OnMouse) + EVT_SET_FOCUS (wxGenericDataViewHeaderWindow::OnSetFocus) END_EVENT_TABLE() -wxDataViewHeaderWindow::wxDataViewHeaderWindow( wxDataViewCtrl *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size, const wxString &name ) : - wxWindow( parent, id, pos, size, 0, name ) +bool wxGenericDataViewHeaderWindow::Create(wxDataViewCtrl *parent, wxWindowID id, + const wxPoint &pos, const wxSize &size, + const wxString &name ) { - SetOwner( parent ); + m_owner = parent; - m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE ); + if (!wxDataViewHeaderWindowBase::Create(parent, id, pos, size, name)) + return false; wxVisualAttributes attr = wxPanel::GetClassDefaultAttributes(); + SetBackgroundStyle( wxBG_STYLE_CUSTOM ); SetOwnForegroundColour( attr.colFg ); SetOwnBackgroundColour( attr.colBg ); if (!m_hasFont) SetOwnFont( attr.font ); -} -wxDataViewHeaderWindow::~wxDataViewHeaderWindow() -{ - delete m_resizeCursor; + // set our size hints: wxDataViewCtrl will put this wxWindow inside + // a wxBoxSizer and in order to avoid super-big header windows, + // we need to set our height as fixed + SetMinSize(wxSize(-1, HEADER_WINDOW_HEIGHT)); + SetMaxSize(wxSize(-1, HEADER_WINDOW_HEIGHT)); + + return true; } -void wxDataViewHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) +void wxGenericDataViewHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) { int w, h; GetClientSize( &w, &h ); - wxPaintDC dc( this ); + wxAutoBufferedPaintDC dc( this ); + + dc.SetBackground(GetBackgroundColour()); + dc.Clear(); int xpix; m_owner->GetScrollPixelsPerUnit( &xpix, NULL ); @@ -638,204 +1354,248 @@ void wxDataViewHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) dc.SetFont( GetFont() ); - size_t cols = GetOwner()->GetNumberOfColumns(); - size_t i; + unsigned int cols = GetOwner()->GetColumnCount(); + unsigned int i; int xpos = 0; for (i = 0; i < cols; i++) { - wxDataViewColumn *col = GetOwner()->GetColumn( i ); - int width = col->GetWidth(); + wxDataViewColumn *col = GetColumn( i ); + if (col->IsHidden()) + continue; // skip it! - int cw = width; + int cw = col->GetWidth(); int ch = h; + wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE; + if (col->IsSortable()) + { + if (col->IsSortOrderAscending()) + sortArrow = wxHDR_SORT_ICON_UP; + else + sortArrow = wxHDR_SORT_ICON_DOWN; + } + wxRendererNative::Get().DrawHeaderButton ( this, dc, wxRect(xpos, 0, cw, ch-1), m_parent->IsEnabled() ? 0 - : (int)wxCONTROL_DISABLED + : (int)wxCONTROL_DISABLED, + sortArrow ); - dc.DrawText( col->GetTitle(), xpos+3, 3 ); + // align as required the column title: + int x = xpos; + wxSize titleSz = dc.GetTextExtent(col->GetTitle()); + switch (col->GetAlignment()) + { + case wxALIGN_LEFT: + x += HEADER_HORIZ_BORDER; + break; + case wxALIGN_CENTER: + case wxALIGN_CENTER_HORIZONTAL: + x += (cw - titleSz.GetWidth() - 2 * HEADER_HORIZ_BORDER)/2; + break; + case wxALIGN_RIGHT: + x += cw - titleSz.GetWidth() - HEADER_HORIZ_BORDER; + break; + } - xpos += width; - } -} + // always center the title vertically: + int y = wxMax((ch - titleSz.GetHeight()) / 2, HEADER_VERT_BORDER); -void wxDataViewHeaderWindow::OnMouse( wxMouseEvent &WXUNUSED(event) ) -{ + dc.SetClippingRegion( xpos+HEADER_HORIZ_BORDER, + HEADER_VERT_BORDER, + wxMax(cw - 2 * HEADER_HORIZ_BORDER, 1), // width + wxMax(ch - 2 * HEADER_VERT_BORDER, 1)); // height + dc.DrawText( col->GetTitle(), x, y ); + dc.DestroyClippingRegion(); + + xpos += cw; + } } -void wxDataViewHeaderWindow::OnSetFocus( wxFocusEvent &event ) +void wxGenericDataViewHeaderWindow::OnSetFocus( wxFocusEvent &event ) { GetParent()->SetFocus(); event.Skip(); } -//----------------------------------------------------------------------------- -// wxDataViewRenameTimer -//----------------------------------------------------------------------------- - -wxDataViewRenameTimer::wxDataViewRenameTimer( wxDataViewMainWindow *owner ) +void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event ) { - m_owner = owner; -} + // we want to work with logical coords + int x; + m_owner->CalcUnscrolledPosition(event.GetX(), 0, &x, NULL); + int y = event.GetY(); -void wxDataViewRenameTimer::Notify() -{ - m_owner->OnRenameTimer(); -} + if (m_isDragging) + { + // we don't draw the line beyond our window, + // but we allow dragging it there + int w = 0; + GetClientSize( &w, NULL ); + m_owner->CalcUnscrolledPosition(w, 0, &w, NULL); + w -= 6; + + // erase the line if it was drawn + if (m_currentX < w) + DrawCurrent(); + + if (event.ButtonUp()) + { + m_isDragging = false; + if (HasCapture()) + ReleaseMouse(); -//----------------------------------------------------------------------------- -// wxDataViewTextCtrlWrapper: wraps a wxTextCtrl for inline editing -//----------------------------------------------------------------------------- + m_dirty = true; -BEGIN_EVENT_TABLE(wxDataViewTextCtrlWrapper, wxEvtHandler) - EVT_CHAR (wxDataViewTextCtrlWrapper::OnChar) - EVT_KEY_UP (wxDataViewTextCtrlWrapper::OnKeyUp) - EVT_KILL_FOCUS (wxDataViewTextCtrlWrapper::OnKillFocus) -END_EVENT_TABLE() + GetColumn(m_column)->SetWidth(m_currentX - m_minX); -wxDataViewTextCtrlWrapper::wxDataViewTextCtrlWrapper( - wxDataViewMainWindow *owner, - wxTextCtrl *text, - wxDataViewListModel *model, - size_t col, size_t row, - wxRect rectLabel ) -{ - m_owner = owner; - m_model = model; - m_row = row; - m_col = col; - m_text = text; + Refresh(); + GetOwner()->Refresh(); + } + else + { + m_currentX = wxMax(m_minX + 7, x); - m_finished = false; - m_aboutToFinish = false; + // draw in the new location + if (m_currentX < w) DrawCurrent(); + } - wxVariant value; - model->GetValue( value, col, row ); - m_startValue = value.GetString(); + } + else // not dragging + { + m_minX = 0; + m_column = wxNOT_FOUND; - m_owner->GetOwner()->CalcScrolledPosition( - rectLabel.x, rectLabel.y, &rectLabel.x, &rectLabel.y ); + bool hit_border = false; - m_text->Create( owner, wxID_ANY, m_startValue, - wxPoint(rectLabel.x-2,rectLabel.y-2), - wxSize(rectLabel.width+7,rectLabel.height+4) ); - m_text->SetFocus(); + // end of the current column + int xpos = 0; - m_text->PushEventHandler(this); -} + // find the column where this event occured + int countCol = m_owner->GetColumnCount(); + for (int column = 0; column < countCol; column++) + { + wxDataViewColumn *p = GetColumn(column); -void wxDataViewTextCtrlWrapper::AcceptChangesAndFinish() -{ - m_aboutToFinish = true; + if (p->IsHidden()) + continue; // skip if not shown - // Notify the owner about the changes - AcceptChanges(); + xpos += p->GetWidth(); + m_column = column; + if ((abs(x-xpos) < 3) && (y < 22)) + { + hit_border = true; + break; + } - // Even if vetoed, close the control (consistent with MSW) - Finish(); -} + if (x < xpos) + { + // inside the column + break; + } -void wxDataViewTextCtrlWrapper::OnChar( wxKeyEvent &event ) -{ - switch ( event.m_keyCode ) - { - case WXK_RETURN: - AcceptChangesAndFinish(); - break; + m_minX = xpos; + } - case WXK_ESCAPE: - // m_owner->OnRenameCancelled( m_itemEdited ); - Finish(); - break; + if (m_column == wxNOT_FOUND) + return; - default: - event.Skip(); + bool resizeable = GetColumn(m_column)->IsResizeable(); + if (event.LeftDClick() && resizeable) + { + GetColumn(m_column)->SetWidth(GetOwner()->GetBestColumnWidth(m_column)); + Refresh(); + } + else if (event.LeftDown() || event.RightUp()) + { + if (hit_border && event.LeftDown() && resizeable) + { + m_isDragging = true; + CaptureMouse(); + m_currentX = x; + DrawCurrent(); + } + else // click on a column + { + wxEventType evt = event.LeftDown() ? + wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK : + wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK; + SendEvent(evt, m_column); + } + } + else if (event.Moving()) + { + if (hit_border && resizeable) + m_currentCursor = m_resizeCursor; + else + m_currentCursor = wxSTANDARD_CURSOR; + + SetCursor(*m_currentCursor); + } } } -void wxDataViewTextCtrlWrapper::OnKeyUp( wxKeyEvent &event ) +void wxGenericDataViewHeaderWindow::DrawCurrent() { - if (m_finished) - { - event.Skip(); - return; - } + int x1 = m_currentX; + int y1 = 0; + ClientToScreen (&x1, &y1); - // auto-grow the textctrl - wxSize parentSize = m_owner->GetSize(); - wxPoint myPos = m_text->GetPosition(); - wxSize mySize = m_text->GetSize(); - int sx, sy; - m_text->GetTextExtent(m_text->GetValue() + _T("MM"), &sx, &sy); - if (myPos.x + sx > parentSize.x) - sx = parentSize.x - myPos.x; - if (mySize.x > sx) - sx = mySize.x; - m_text->SetSize(sx, wxDefaultCoord); + int x2 = m_currentX-1; +#ifdef __WXMSW__ + ++x2; // but why ???? +#endif + int y2 = 0; + m_owner->GetClientSize( NULL, &y2 ); + m_owner->ClientToScreen( &x2, &y2 ); - event.Skip(); + wxScreenDC dc; + dc.SetLogicalFunction(wxINVERT); + dc.SetPen(m_penCurrent); + dc.SetBrush(*wxTRANSPARENT_BRUSH); + AdjustDC(dc); + dc.DrawLine(x1, y1, x2, y2); } -void wxDataViewTextCtrlWrapper::OnKillFocus( wxFocusEvent &event ) +void wxGenericDataViewHeaderWindow::AdjustDC(wxDC& dc) { - if ( !m_finished && !m_aboutToFinish ) - { - AcceptChanges(); - //if ( !AcceptChanges() ) - // m_owner->OnRenameCancelled( m_itemEdited ); + int xpix, x; - Finish(); - } + m_owner->GetScrollPixelsPerUnit( &xpix, NULL ); + m_owner->GetViewStart( &x, NULL ); - // We must let the native text control handle focus - event.Skip(); + // shift the DC origin to match the position of the main window horizontal + // scrollbar: this allows us to always use logical coords + dc.SetDeviceOrigin( -x * xpix, 0 ); } -bool wxDataViewTextCtrlWrapper::AcceptChanges() -{ - const wxString value = m_text->GetValue(); - - if ( value == m_startValue ) - // nothing changed, always accept - return true; - -// if ( !m_owner->OnRenameAccept(m_itemEdited, value) ) - // vetoed by the user -// return false; +#endif // defined(__WXMSW__) - // accepted, do rename the item - wxVariant variant; - variant = value; - m_model->SetValue( variant, m_col, m_row ); - m_model->ValueChanged( m_col, m_row ); +//----------------------------------------------------------------------------- +// wxDataViewRenameTimer +//----------------------------------------------------------------------------- - return true; +wxDataViewRenameTimer::wxDataViewRenameTimer( wxDataViewMainWindow *owner ) +{ + m_owner = owner; } -void wxDataViewTextCtrlWrapper::Finish() +void wxDataViewRenameTimer::Notify() { - if ( !m_finished ) - { - m_finished = true; - - m_text->RemoveEventHandler(this); - m_owner->FinishEditing(m_text); - - // delete later - wxPendingDelete.Append( this ); - } + m_owner->OnRenameTimer(); } //----------------------------------------------------------------------------- // wxDataViewMainWindow //----------------------------------------------------------------------------- -int LINKAGEMODE wxDataViewSelectionCmp( size_t row1, size_t row2 ) +//The tree building helper, declared firstly +void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node); + +int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 ) { if (row1 > row2) return 1; if (row1 == row2) return 0; @@ -863,30 +1623,47 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i m_lastOnSame = false; m_renameTimer = new wxDataViewRenameTimer( this ); - m_textctrlWrapper = NULL; // TODO: user better initial values/nothing selected m_currentCol = NULL; m_currentRow = 0; // TODO: we need to calculate this smartly - m_lineHeight = 20; + m_lineHeight = +#ifdef __WXMSW__ + 17; +#else + 20; +#endif + wxASSERT(m_lineHeight > 2*PADDING_TOPBOTTOM); m_dragCount = 0; m_dragStart = wxPoint(0,0); - m_lineLastClicked = (size_t) -1; - m_lineBeforeLastClicked = (size_t) -1; - m_lineSelectSingleOnUp = (size_t) -1; + m_lineLastClicked = (unsigned int) -1; + m_lineBeforeLastClicked = (unsigned int) -1; + m_lineSelectSingleOnUp = (unsigned int) -1; m_hasFocus = false; + SetBackgroundStyle( wxBG_STYLE_CUSTOM ); SetBackgroundColour( *wxWHITE ); + m_penRule = wxPen(GetRuleColour(), 1, wxSOLID); + + //Here I compose a pen can draw black lines, maybe there are something system colour to use + m_penExpander = wxPen( wxColour(0,0,0), 1, wxSOLID ); + //Some new added code to deal with the tree structure + m_root = new wxDataViewTreeNode( NULL ); + m_root->SetHasChildren(true); + + //Make m_count = -1 will cause the class recaculate the real displaying number of rows. + m_count = -1 ; UpdateDisplay(); } wxDataViewMainWindow::~wxDataViewMainWindow() { + DestroyTree(); delete m_renameTimer; } @@ -897,78 +1674,166 @@ void wxDataViewMainWindow::OnRenameTimer() if ( m_dirty ) wxSafeYield(); - int xpos = 0; - size_t cols = GetOwner()->GetNumberOfColumns(); - size_t i; + unsigned int cols = GetOwner()->GetColumnCount(); + unsigned int i; for (i = 0; i < cols; i++) { - wxDataViewColumn *c = GetOwner()->GetColumn( i ); - if (c == m_currentCol) - break; - xpos += c->GetWidth(); + wxDataViewColumn *c = GetOwner()->GetColumn( i ); + if (c->IsHidden()) + continue; // skip it! + + if (c == m_currentCol) + break; + xpos += c->GetWidth(); + } + wxRect labelRect( xpos, m_currentRow * m_lineHeight, + m_currentCol->GetWidth(), m_lineHeight ); + + GetOwner()->CalcScrolledPosition( labelRect.x, labelRect.y, + &labelRect.x, &labelRect.y); + + wxDataViewItem item = GetItemByRow( m_currentRow ); + m_currentCol->GetRenderer()->StartEditing( item, labelRect ); +} + +//------------------------------------------------------------------ +// Helper class for do operation on the tree node +//------------------------------------------------------------------ +class DoJob +{ +public: + DoJob(){}; + virtual ~DoJob(){}; + + //The return value control how the tree-walker tranverse the tree + // 0: Job done, stop tranverse and return + // 1: Ignore the current node's subtree and continue + // 2: Job not done, continue + enum { OK = 0 , IGR = 1, CONT = 2 }; + virtual int operator() ( wxDataViewTreeNode * node ) = 0 ; +}; + +class ItemAddJob: public DoJob +{ +public: + ItemAddJob( const wxDataViewItem & parent, const wxDataViewItem & item, int * count ) + { this->parent = parent ; this->item = item ; m_count = count; } + virtual ~ItemAddJob(){}; + + virtual int operator() ( wxDataViewTreeNode * node ) + { + if( node->GetItem() == parent ) + { + node->SetHasChildren( true ); + wxDataViewTreeNode * newnode = new wxDataViewTreeNode( node ); + newnode->SetItem(item); + node->AppendChild( newnode); + *m_count = -1; + return OK; + } + return CONT; } - wxRect labelRect( xpos, m_currentRow * m_lineHeight, m_currentCol->GetWidth(), m_lineHeight ); - - wxClassInfo *textControlClass = CLASSINFO(wxTextCtrl); - wxTextCtrl * const text = (wxTextCtrl *)textControlClass->CreateObject(); - m_textctrlWrapper = new wxDataViewTextCtrlWrapper(this, text, GetOwner()->GetModel(), - m_currentCol->GetModelColumn(), m_currentRow, labelRect ); -} +private: + int * m_count; + wxDataViewItem parent, item; +}; -void wxDataViewMainWindow::FinishEditing( wxTextCtrl *text ) +bool Walker( wxDataViewTreeNode * node, DoJob & func ) { - delete text; - m_textctrlWrapper = NULL; - SetFocus(); - // SetFocusIgnoringChildren(); -} + if( node==NULL || !node->HasChildren()) + return false; -bool wxDataViewMainWindow::RowAppended() -{ + wxDataViewTreeNodes nodes = node->GetChildren(); + int len = node->GetChildrenNumber(); + int i = 0 ; + for( ; i < len ; i ++ ) + { + wxDataViewTreeNode * n = nodes[i]; + switch( func( n ) ) + { + case DoJob::OK : + return true ; + case DoJob::IGR: + continue; + case DoJob::CONT: + default: + ; + } + + if( Walker( n , func ) ) + return true; + } return false; } -bool wxDataViewMainWindow::RowPrepended() +bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxDataViewItem & item) { - return false; + ItemAddJob job( parent, item, &m_count); + Walker( m_root , job); + UpdateDisplay(); + return true; } -bool wxDataViewMainWindow::RowInserted( size_t WXUNUSED(before) ) +class ItemDeleteJob: public DoJob { - return false; -} +public: + ItemDeleteJob( const wxDataViewItem & item, int * count ) { m_item = item; m_count = count; } + virtual ~ItemDeleteJob(){} + virtual int operator() ( wxDataViewTreeNode * node ) + { + if( node->GetItem() == m_item ) + { + node->GetParent()->GetChildren().Remove( node ); + delete node; + *m_count = -1; + return DoJob::OK; + } + return DoJob::CONT; + } -bool wxDataViewMainWindow::RowDeleted( size_t WXUNUSED(row) ) +private: + int * m_count; + wxDataViewItem m_item; +}; + +bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem & item) { - return false; + ItemDeleteJob job( item, &m_count); + Walker( m_root, job); + UpdateDisplay(); + return true; } -bool wxDataViewMainWindow::RowChanged( size_t WXUNUSED(row) ) +bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item) { - return false; + unsigned int row = GetRowByItem(item); + RefreshRow( row ); + return true; } -bool wxDataViewMainWindow::ValueChanged( size_t WXUNUSED(col), size_t row ) +bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned int WXUNUSED(col) ) { - wxRect rect( 0, row*m_lineHeight, 10000, m_lineHeight ); + // NOTE: to be valid, we cannot use e.g. INT_MAX - 1 +/*#define MAX_VIRTUAL_WIDTH 100000 + + wxRect rect( 0, row*m_lineHeight, MAX_VIRTUAL_WIDTH, m_lineHeight ); m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); Refresh( true, &rect ); return true; -} - -bool wxDataViewMainWindow::RowsReordered( size_t *WXUNUSED(new_order) ) -{ - Refresh(); - +*/ + unsigned int row = GetRowByItem(item); + RefreshRow( row ); return true; } bool wxDataViewMainWindow::Cleared() { - return false; + DestroyTree(); + UpdateDisplay(); + return true; } void wxDataViewMainWindow::UpdateDisplay() @@ -989,23 +1854,15 @@ void wxDataViewMainWindow::OnInternalIdle() void wxDataViewMainWindow::RecalculateDisplay() { - wxDataViewListModel *model = GetOwner()->GetModel(); + wxDataViewModel *model = GetOwner()->GetModel(); if (!model) { Refresh(); return; } - int width = 0; - size_t cols = GetOwner()->GetNumberOfColumns(); - size_t i; - for (i = 0; i < cols; i++) - { - wxDataViewColumn *col = GetOwner()->GetColumn( i ); - width += col->GetWidth(); - } - - int height = model->GetNumberOfRows() * m_lineHeight; + int width = GetEndOfLastCol(); + int height = GetRowCount() * m_lineHeight; SetVirtualSize( width, height ); GetOwner()->SetScrollRate( 10, m_lineHeight ); @@ -1016,39 +1873,113 @@ void wxDataViewMainWindow::RecalculateDisplay() void wxDataViewMainWindow::ScrollWindow( int dx, int dy, const wxRect *rect ) { wxWindow::ScrollWindow( dx, dy, rect ); - GetOwner()->m_headerArea->ScrollWindow( dx, 0 ); + + if (GetOwner()->m_headerArea) + GetOwner()->m_headerArea->ScrollWindow( dx, 0 ); } void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) { - wxPaintDC dc( this ); + wxDataViewModel *model = GetOwner()->GetModel(); + wxAutoBufferedPaintDC dc( this ); + // prepare the DC + dc.SetBackground(GetBackgroundColour()); + dc.Clear(); GetOwner()->PrepareDC( dc ); - dc.SetFont( GetFont() ); wxRect update = GetUpdateRegion().GetBox(); m_owner->CalcUnscrolledPosition( update.x, update.y, &update.x, &update.y ); - wxDataViewListModel *model = GetOwner()->GetModel(); + // compute which items needs to be redrawn + unsigned int item_start = wxMax( 0, (update.y / m_lineHeight) ); + unsigned int item_count = + wxMin( (int)(((update.y + update.height) / m_lineHeight) - item_start + 1), + (int)(GetRowCount( )- item_start) ); + unsigned int item_last = item_start + item_count; + + // compute which columns needs to be redrawn + unsigned int cols = GetOwner()->GetColumnCount(); + unsigned int col_start = 0; + unsigned int x_start = 0; + for (x_start = 0; col_start < cols; col_start++) + { + wxDataViewColumn *col = GetOwner()->GetColumn(col_start); + if (col->IsHidden()) + continue; // skip it! + + unsigned int w = col->GetWidth(); + if (x_start+w >= (unsigned int)update.x) + break; + + x_start += w; + } + + unsigned int col_last = col_start; + unsigned int x_last = x_start; + for (; col_last < cols; col_last++) + { + wxDataViewColumn *col = GetOwner()->GetColumn(col_last); + if (col->IsHidden()) + continue; // skip it! + + if (x_last > (unsigned int)update.GetRight()) + break; + + x_last += col->GetWidth(); + } + + // Draw horizontal rules if required + if ( m_owner->HasFlag(wxDV_HORIZ_RULES) ) + { + dc.SetPen(m_penRule); + dc.SetBrush(*wxTRANSPARENT_BRUSH); + + for (unsigned int i = item_start; i <= item_last+1; i++) + { + int y = i * m_lineHeight; + dc.DrawLine(x_start, y, x_last, y); + } + } + + // Draw vertical rules if required + if ( m_owner->HasFlag(wxDV_VERT_RULES) ) + { + dc.SetPen(m_penRule); + dc.SetBrush(*wxTRANSPARENT_BRUSH); + + int x = x_start; + for (unsigned int i = col_start; i < col_last; i++) + { + wxDataViewColumn *col = GetOwner()->GetColumn(i); + if (col->IsHidden()) + continue; // skip it - size_t item_start = wxMax( 0, (update.y / m_lineHeight) ); - size_t item_count = wxMin( (int)(((update.y + update.height) / m_lineHeight) - item_start + 1), - (int)(model->GetNumberOfRows()-item_start) ); + dc.DrawLine(x, item_start * m_lineHeight, + x, item_last * m_lineHeight); + x += col->GetWidth(); + } + // Draw last vertical rule + dc.DrawLine(x, item_start * m_lineHeight, + x, item_last * m_lineHeight); + } - size_t item; - for (item = item_start; item < item_start+item_count; item++) + // redraw the background for the items which are selected/current + for (unsigned int item = item_start; item < item_last; item++) { - if (m_selection.Index( item ) != wxNOT_FOUND) + bool selected = m_selection.Index( item ) != wxNOT_FOUND; + if (selected || item == m_currentRow) { - int flags = wxCONTROL_SELECTED; + int flags = selected ? (int)wxCONTROL_SELECTED : 0; if (item == m_currentRow) flags |= wxCONTROL_CURRENT; if (m_hasFocus) flags |= wxCONTROL_FOCUSED; - wxRect rect( 0, item*m_lineHeight+1, GetEndOfLastCol(), m_lineHeight-2 ); + + wxRect rect( x_start, item*m_lineHeight, x_last, m_lineHeight ); wxRendererNative::Get().DrawItemSelectionRect ( this, @@ -1057,81 +1988,146 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) flags ); } - else - { - if (item == m_currentRow) - { - int flags = wxCONTROL_CURRENT; - if (m_hasFocus) - flags |= wxCONTROL_FOCUSED; // should have no effect - wxRect rect( 0, item*m_lineHeight+1, GetEndOfLastCol(), m_lineHeight-2 ); - wxRendererNative::Get().DrawItemSelectionRect - ( - this, - dc, - rect, - flags - ); - - } - } } + // redraw all cells for all rows which must be repainted and for all columns wxRect cell_rect; - cell_rect.x = 0; - cell_rect.height = m_lineHeight; - size_t cols = GetOwner()->GetNumberOfColumns(); - size_t i; - for (i = 0; i < cols; i++) + cell_rect.x = x_start; + cell_rect.height = m_lineHeight; // -1 is for the horizontal rules + for (unsigned int i = col_start; i < col_last; i++) { wxDataViewColumn *col = GetOwner()->GetColumn( i ); - wxDataViewCell *cell = col->GetCell(); + wxDataViewRenderer *cell = col->GetRenderer(); cell_rect.width = col->GetWidth(); - for (item = item_start; item < item_start+item_count; item++) + if (col->IsHidden()) + continue; // skipt it! + + for (unsigned int item = item_start; item < item_last; item++) { - cell_rect.y = item*m_lineHeight; + // get the cell value and set it into the renderer wxVariant value; - model->GetValue( value, col->GetModelColumn(), item ); + wxDataViewTreeNode * node = GetTreeNodeByRow(item); + if( node == NULL ) + continue; + + wxDataViewItem dataitem = node->GetItem(); + model->GetValue( value, dataitem, col->GetModelColumn()); cell->SetValue( value ); + + // update the y offset + cell_rect.y = item * m_lineHeight; + + //Draw the expander here. Please notice that I use const number for all pixel data. When the final API are determined + //I will change this to the data member of the class wxDataViewCtrl + int indent = node->GetIndentLevel(); + if( col->GetModelColumn() == GetOwner()->GetExpanderColumn() ) + { + //Calculate the indent first + indent = cell_rect.x + GetOwner()->GetIndent() * indent; + + int expander_width = m_lineHeight - 2*EXPANDER_MARGIN; + // change the cell_rect.x to the appropriate pos + int expander_x = indent + EXPANDER_MARGIN , expander_y = cell_rect.y + EXPANDER_MARGIN ; + indent = indent + m_lineHeight ; //try to use the m_lineHeight as the expander space + dc.SetPen( m_penExpander ); + dc.SetBrush( wxNullBrush ); + if( node->HasChildren() ) + { + //dc.DrawRoundedRectangle( expander_x,expander_y,expander_width,expander_width, 1.0); + //dc.DrawLine( expander_x + 2 , expander_y + expander_width/2, expander_x + expander_width - 2, expander_y + expander_width/2 ); + wxRect rect( expander_x , expander_y, expander_width, expander_width); + if( node->IsOpen() ) + wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, wxCONTROL_EXPANDED ); + else + wxRendererNative::Get().DrawTreeItemButton( this, dc, rect ); + } + else + { + // I am wandering whether we should draw dot lines between tree nodes + } + + //force the expander column to left-center align + cell->SetAlignment( wxALIGN_CENTER_VERTICAL ); + } + + + // cannot be bigger than allocated space wxSize size = cell->GetSize(); - // cannot be bigger than allocated space - size.x = wxMin( size.x, cell_rect.width ); - size.y = wxMin( size.y, cell_rect.height ); - // TODO: check for left/right/centre alignment here - wxRect item_rect; - // for now: centre - item_rect.x = cell_rect.x + (cell_rect.width / 2) - (size.x / 2); - item_rect.y = cell_rect.y + (cell_rect.height / 2) - (size.y / 2); - - item_rect.width = size.x; - item_rect.height= size.y; - cell->Render( item_rect, &dc, 0 ); + // Because of the tree structure indent, here we should minus the width of the cell for drawing + size.x = wxMin( size.x + 2*PADDING_RIGHTLEFT, cell_rect.width - indent ); + size.y = wxMin( size.y + 2*PADDING_TOPBOTTOM, cell_rect.height ); + + wxRect item_rect(cell_rect.GetTopLeft(), size); + int align = cell->GetAlignment(); + + // horizontal alignment: + item_rect.x = cell_rect.x; + if (align & wxALIGN_CENTER_HORIZONTAL) + item_rect.x = cell_rect.x + (cell_rect.width / 2) - (size.x / 2); + else if (align & wxALIGN_RIGHT) + item_rect.x = cell_rect.x + cell_rect.width - size.x; + //else: wxALIGN_LEFT is the default + + // vertical alignment: + item_rect.y = cell_rect.y; + if (align & wxALIGN_CENTER_VERTICAL) + item_rect.y = cell_rect.y + (cell_rect.height / 2) - (size.y / 2); + else if (align & wxALIGN_BOTTOM) + item_rect.y = cell_rect.y + cell_rect.height - size.y; + //else: wxALIGN_TOP is the default + + // add padding + item_rect.x += PADDING_RIGHTLEFT; + item_rect.y += PADDING_TOPBOTTOM; + item_rect.width = size.x - 2 * PADDING_RIGHTLEFT; + item_rect.height = size.y - 2 * PADDING_TOPBOTTOM; + + //Here we add the tree indent + item_rect.x += indent; + + int state = 0; + if (m_selection.Index(item) != wxNOT_FOUND) + state |= wxDATAVIEW_CELL_SELECTED; + + // TODO: it would be much more efficient to create a clipping + // region for the entire column being rendered (in the OnPaint + // of wxDataViewMainWindow) instead of a single clip region for + // each cell. However it would mean that each renderer should + // respect the given wxRect's top & bottom coords, eventually + // violating only the left & right coords - however the user can + // make its own renderer and thus we cannot be sure of that. + dc.SetClippingRegion( item_rect ); + cell->Render( item_rect, &dc, state ); + dc.DestroyClippingRegion(); } cell_rect.x += cell_rect.width; } } -int wxDataViewMainWindow::GetCountPerPage() +int wxDataViewMainWindow::GetCountPerPage() const { wxSize size = GetClientSize(); return size.y / m_lineHeight; } -int wxDataViewMainWindow::GetEndOfLastCol() +int wxDataViewMainWindow::GetEndOfLastCol() const { int width = 0; - size_t i; - for (i = 0; i < GetOwner()->GetNumberOfColumns(); i++) + unsigned int i; + for (i = 0; i < GetOwner()->GetColumnCount(); i++) { - wxDataViewColumn *c = GetOwner()->GetColumn( i ); - width += c->GetWidth(); + const wxDataViewColumn *c = + wx_const_cast(wxDataViewCtrl*, GetOwner())->GetColumn( i ); + + if (!c->IsHidden()) + width += c->GetWidth(); } return width; } -size_t wxDataViewMainWindow::GetFirstVisibleRow() +unsigned int wxDataViewMainWindow::GetFirstVisibleRow() const { int x = 0; int y = 0; @@ -1140,20 +2136,30 @@ size_t wxDataViewMainWindow::GetFirstVisibleRow() return y / m_lineHeight; } -size_t wxDataViewMainWindow::GetLastVisibleRow() +unsigned int wxDataViewMainWindow::GetLastVisibleRow() { wxSize client_size = GetClientSize(); - m_owner->CalcUnscrolledPosition( client_size.x, client_size.y, &client_size.x, &client_size.y ); + m_owner->CalcUnscrolledPosition( client_size.x, client_size.y, + &client_size.x, &client_size.y ); return wxMin( GetRowCount()-1, ((unsigned)client_size.y/m_lineHeight)+1 ); } -size_t wxDataViewMainWindow::GetRowCount() +unsigned int wxDataViewMainWindow::GetRowCount() { - return GetOwner()->GetModel()->GetNumberOfRows(); + if ( m_count == -1 ) + { + m_count = RecalculateCount(); + int width, height; + GetVirtualSize( &width, &height ); + height = m_count * m_lineHeight; + + SetVirtualSize( width, height ); + } + return m_count; } -void wxDataViewMainWindow::ChangeCurrentRow( size_t row ) +void wxDataViewMainWindow::ChangeCurrentRow( unsigned int row ) { m_currentRow = row; @@ -1168,18 +2174,18 @@ void wxDataViewMainWindow::SelectAllRows( bool on ) if (on) { m_selection.Clear(); - for (size_t i = 0; i < GetRowCount(); i++) + for (unsigned int i = 0; i < GetRowCount(); i++) m_selection.Add( i ); Refresh(); } else { - size_t first_visible = GetFirstVisibleRow(); - size_t last_visible = GetLastVisibleRow(); - size_t i; + unsigned int first_visible = GetFirstVisibleRow(); + unsigned int last_visible = GetLastVisibleRow(); + unsigned int i; for (i = 0; i < m_selection.GetCount(); i++) { - size_t row = m_selection[i]; + unsigned int row = m_selection[i]; if ((row >= first_visible) && (row <= last_visible)) RefreshRow( row ); } @@ -1187,7 +2193,7 @@ void wxDataViewMainWindow::SelectAllRows( bool on ) } } -void wxDataViewMainWindow::SelectRow( size_t row, bool on ) +void wxDataViewMainWindow::SelectRow( unsigned int row, bool on ) { if (m_selection.Index( row ) == wxNOT_FOUND) { @@ -1207,16 +2213,16 @@ void wxDataViewMainWindow::SelectRow( size_t row, bool on ) } } -void wxDataViewMainWindow::SelectRows( size_t from, size_t to, bool on ) +void wxDataViewMainWindow::SelectRows( unsigned int from, unsigned int to, bool on ) { if (from > to) { - size_t tmp = from; + unsigned int tmp = from; from = to; to = tmp; } - size_t i; + unsigned int i; for (i = from; i <= to; i++) { if (m_selection.Index( i ) == wxNOT_FOUND) @@ -1233,7 +2239,18 @@ void wxDataViewMainWindow::SelectRows( size_t from, size_t to, bool on ) RefreshRows( from, to ); } -void wxDataViewMainWindow::ReverseRowSelection( size_t row ) +void wxDataViewMainWindow::Select( const wxArrayInt& aSelections ) +{ + for (size_t i=0; i < aSelections.GetCount(); i++) + { + int n = aSelections[i]; + + m_selection.Add( n ); + RefreshRow( n ); + } +} + +void wxDataViewMainWindow::ReverseRowSelection( unsigned int row ) { if (m_selection.Index( row ) == wxNOT_FOUND) m_selection.Add( row ); @@ -1242,12 +2259,12 @@ void wxDataViewMainWindow::ReverseRowSelection( size_t row ) RefreshRow( row ); } -bool wxDataViewMainWindow::IsRowSelected( size_t row ) +bool wxDataViewMainWindow::IsRowSelected( unsigned int row ) { return (m_selection.Index( row ) != wxNOT_FOUND); } -void wxDataViewMainWindow::RefreshRow( size_t row ) +void wxDataViewMainWindow::RefreshRow( unsigned int row ) { wxRect rect( 0, row*m_lineHeight, GetEndOfLastCol(), m_lineHeight ); m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); @@ -1259,11 +2276,11 @@ void wxDataViewMainWindow::RefreshRow( size_t row ) Refresh( true, &intersect_rect ); } -void wxDataViewMainWindow::RefreshRows( size_t from, size_t to ) +void wxDataViewMainWindow::RefreshRows( unsigned int from, unsigned int to ) { if (from > to) { - size_t tmp = to; + unsigned int tmp = to; to = from; from = tmp; } @@ -1278,9 +2295,9 @@ void wxDataViewMainWindow::RefreshRows( size_t from, size_t to ) Refresh( true, &intersect_rect ); } -void wxDataViewMainWindow::RefreshRowsAfter( size_t firstRow ) +void wxDataViewMainWindow::RefreshRowsAfter( unsigned int firstRow ) { - size_t count = GetRowCount(); + unsigned int count = GetRowCount(); if (firstRow > count) return; @@ -1294,7 +2311,7 @@ void wxDataViewMainWindow::RefreshRowsAfter( size_t firstRow ) Refresh( true, &intersect_rect ); } -void wxDataViewMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event) +void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event) { wxCHECK_RET( newCurrent < GetRowCount(), _T("invalid item index in OnArrowChar()") ); @@ -1303,7 +2320,7 @@ void wxDataViewMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& even if (!HasCurrentRow()) return; - size_t oldCurrent = m_currentRow; + unsigned int oldCurrent = m_currentRow; // in single selection we just ignore Shift as we can't select several // items anyhow @@ -1338,7 +2355,239 @@ void wxDataViewMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& even RefreshRow( m_currentRow ); } - // MoveToFocus(); + //EnsureVisible( m_currentRow ); +} + +wxRect wxDataViewMainWindow::GetLineRect( unsigned int row ) const +{ + wxRect rect; + rect.x = 0; + rect.y = m_lineHeight * row; + rect.width = GetEndOfLastCol(); + rect.height = m_lineHeight; + + return rect; +} + +class RowToItemJob: public DoJob +{ +public: + RowToItemJob( unsigned int row , int current ) { this->row = row; this->current = current ;} + virtual ~RowToItemJob(){}; + + virtual int operator() ( wxDataViewTreeNode * node ) + { + if( current == static_cast(row)) + { + ret = node->GetItem() ; + return DoJob::OK; + } + current ++; + if ( node->IsOpen()) + return DoJob::CONT; + else + return DoJob::IGR; + } + + wxDataViewItem GetResult(){ return ret; } +private: + unsigned int row; + int current ; + wxDataViewItem ret; +}; + +wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row) +{ + RowToItemJob job( row, 0 ); + Walker( m_root , job ); + return job.GetResult(); +} + +class RowToTreeNodeJob: public DoJob +{ +public: + RowToTreeNodeJob( unsigned int row , int current ) { this->row = row; this->current = current ; ret = NULL ; } + virtual ~RowToTreeNodeJob(){}; + + virtual int operator() ( wxDataViewTreeNode * node ) + { + if( current == static_cast(row)) + { + ret = node ; + return DoJob::OK; + } + current ++; + if ( node->IsOpen()) + return DoJob::CONT; + else + return DoJob::IGR; + } + + wxDataViewTreeNode * GetResult(){ return ret; } +private: + unsigned int row; + int current ; + wxDataViewTreeNode * ret; +}; + + +wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row) +{ + RowToTreeNodeJob job( row , 0 ); + Walker( m_root , job ); + return job.GetResult(); +} + +class CountJob : public DoJob +{ +public: + CountJob(){ count = 0 ; } + virtual ~CountJob(){}; + + virtual int operator () ( wxDataViewTreeNode * node ) + { + count ++; + if ( node->IsOpen()) + return DoJob::CONT; + else + return DoJob::IGR; + } + + unsigned int GetResult() + { + return count ; + } +private: + unsigned int count; +}; + +void wxDataViewMainWindow::OnExpanding( unsigned int row ) +{ + wxDataViewTreeNode * node = GetTreeNodeByRow(row); + if( node != NULL ) + { + if( node->HasChildren()) + if( !node->IsOpen()) + { + node->ToggleOpen(); + //Here I build the children of current node + if( node->GetChildrenNumber() == 0 ) + BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node); + m_count = -1; + Refresh(); + } + } +} + +void wxDataViewMainWindow::OnCollapsing(unsigned int row) +{ + wxDataViewTreeNode * node = GetTreeNodeByRow(row); + if( node != NULL ) + { + if( node->HasChildren() && node->IsOpen() ) + { + node->ToggleOpen(); + m_count = -1; + Refresh(); + //RefreshRows(row,GetLastVisibleRow()); + } + else + { + node = node->GetParent(); + if( node != NULL ) + { + int parent = GetRowByItem( node->GetItem()) ; + SelectRow( row, false); + SelectRow(parent , true ); + ChangeCurrentRow( parent ); + } + } + } +} + +int wxDataViewMainWindow::RecalculateCount() +{ + CountJob job; + Walker( m_root, job ); + return job.GetResult(); +} + +class ItemToRowJob : public DoJob +{ +public: + ItemToRowJob(const wxDataViewItem & item){ this->item = item ; ret = 0 ; } + virtual ~ItemToRowJob(){}; + + virtual int operator() ( wxDataViewTreeNode * node) + { + ret ++; + if( node->GetItem() == item ) + return DoJob::OK; + + if( node->IsOpen()) + return DoJob::CONT; + else + return DoJob::IGR; + } + + //the row number is begin from zero + int GetResult(){ return ret -1 ; } +private: + wxDataViewItem item; + int ret; +}; + +unsigned int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item) +{ + ItemToRowJob job( item ); + Walker(m_root , job ); + return job.GetResult(); +} + +void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node) +{ + if( !model->HasChildren( item ) ) + return ; + + wxDataViewItem i = model->GetFirstChild( item ); + while( i.IsOk() ) + { + wxDataViewTreeNode * n = new wxDataViewTreeNode( node ); + n->SetItem(i); + n->SetHasChildren( model->HasChildren( i )) ; + node->AppendChild(n); + //BuildTreeHelper( model, i, n) ; + i = model->GetNextSibling( i ); + } +} + +void wxDataViewMainWindow::BuildTree(wxDataViewModel * model) +{ + //First we define a invalid item to fetch the top-level elements + wxDataViewItem item; + BuildTreeHelper( model, item, m_root); + m_count = -1 ; +} + +void DestroyTreeHelper( wxDataViewTreeNode * node ) +{ + if( node->HasChildren() ) + { + int len = node->GetChildrenNumber(); + int i = 0 ; + wxDataViewTreeNodes nodes = node->GetChildren(); + for( ; i < len; i ++ ) + { + DestroyTreeHelper(nodes[i]); + } + } + delete node; +} + +void wxDataViewMainWindow::DestroyTree() +{ + DestroyTreeHelper(m_root); + m_count = 0 ; } void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) @@ -1376,7 +2625,13 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) if ( m_currentRow < GetRowCount() - 1 ) OnArrowChar( m_currentRow + 1, event ); break; - + //Add the process for tree expanding/collapsing + case WXK_LEFT: + OnCollapsing(m_currentRow); + break; + case WXK_RIGHT: + OnExpanding( m_currentRow); + break; case WXK_END: if (!IsEmpty()) OnArrowChar( GetRowCount() - 1, event ); @@ -1401,8 +2656,8 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) case WXK_PAGEDOWN: { int steps = pageSize - 1; - size_t index = m_currentRow + steps; - size_t count = GetRowCount(); + unsigned int index = m_currentRow + steps; + unsigned int count = GetRowCount(); if ( index >= count ) index = count - 1; @@ -1431,11 +2686,14 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) wxDataViewColumn *col = NULL; int xpos = 0; - size_t cols = GetOwner()->GetNumberOfColumns(); - size_t i; + unsigned int cols = GetOwner()->GetColumnCount(); + unsigned int i; for (i = 0; i < cols; i++) { wxDataViewColumn *c = GetOwner()->GetColumn( i ); + if (c->IsHidden()) + continue; // skip it! + if (x < xpos + c->GetWidth()) { col = c; @@ -1445,9 +2703,9 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) } if (!col) return; - wxDataViewCell *cell = col->GetCell(); + wxDataViewRenderer *cell = col->GetRenderer(); - size_t current = y / m_lineHeight; + unsigned int current = y / m_lineHeight; if ((current > GetRowCount()) || (x > GetEndOfLastCol())) { @@ -1455,7 +2713,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) return; } - wxDataViewListModel *model = GetOwner()->GetModel(); + wxDataViewModel *model = GetOwner()->GetModel(); if (event.Dragging()) { @@ -1497,11 +2755,13 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) { if (cell->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE) { + wxDataViewItem item = GetItemByRow(current); wxVariant value; - model->GetValue( value, col->GetModelColumn(), current ); + model->GetValue( value, item, col->GetModelColumn() ); cell->SetValue( value ); - wxRect cell_rect( xpos, current * m_lineHeight, col->GetWidth(), m_lineHeight ); - cell->Activate( cell_rect, model, col->GetModelColumn(), current ); + wxRect cell_rect( xpos, current * m_lineHeight, + col->GetWidth(), m_lineHeight ); + cell->Activate( cell_rect, model, item, col->GetModelColumn() ); } return; } @@ -1515,14 +2775,33 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) if (event.LeftUp()) { - if (m_lineSelectSingleOnUp != (size_t)-1) + if (m_lineSelectSingleOnUp != (unsigned int)-1) { // select single line SelectAllRows( false ); SelectRow( m_lineSelectSingleOnUp, true ); } - if (m_lastOnSame) + //Process the event of user clicking the expander + bool expander = false; + wxDataViewTreeNode * node = GetTreeNodeByRow(current); + if( node!=NULL && node->HasChildren() ) + { + int indent = node->GetIndentLevel(); + indent = GetOwner()->GetIndent()*indent; + wxRect rect( xpos + indent + EXPANDER_MARGIN, current * m_lineHeight + EXPANDER_MARGIN, m_lineHeight-2*EXPANDER_MARGIN,m_lineHeight-2*EXPANDER_MARGIN); + if( rect.Contains( x, y) ) + { + expander = true; + if( node->IsOpen() ) + OnCollapsing(current); + else + OnExpanding( current ); + } + } + + //If the user click the expander, we do not do editing even if the column with expander are editable + if (m_lastOnSame && !expander ) { if ((col == m_currentCol) && (current == m_currentRow) && (cell->GetMode() == wxDATAVIEW_CELL_EDITABLE) ) @@ -1532,7 +2811,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) } m_lastOnSame = false; - m_lineSelectSingleOnUp = (size_t)-1; + m_lineSelectSingleOnUp = (unsigned int)-1; } else { @@ -1540,7 +2819,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) // from and to ourself, the up event is swallowed by the // DnD code. So on next non-up event (which means here and // now) m_lineSelectSingleOnUp should be reset. - m_lineSelectSingleOnUp = (size_t)-1; + m_lineSelectSingleOnUp = (unsigned int)-1; } if (event.RightDown()) @@ -1577,7 +2856,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) m_lineBeforeLastClicked = m_lineLastClicked; m_lineLastClicked = current; - size_t oldCurrentRow = m_currentRow; + unsigned int oldCurrentRow = m_currentRow; bool oldWasSelected = IsRowSelected(m_currentRow); bool cmdModifierDown = event.CmdDown(); @@ -1609,7 +2888,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) { ChangeCurrentRow(current); - size_t lineFrom = oldCurrentRow, + unsigned int lineFrom = oldCurrentRow, lineTo = current; if ( lineTo < lineFrom ) @@ -1635,7 +2914,8 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) // Update selection here... m_currentCol = col; - m_lastOnSame = !forceClick && ((col == oldCurrentCol) && (current == oldCurrentRow)) && oldWasSelected; + m_lastOnSame = !forceClick && ((col == oldCurrentCol) && + (current == oldCurrentRow)) && oldWasSelected; } } @@ -1659,6 +2939,13 @@ void wxDataViewMainWindow::OnKillFocus( wxFocusEvent &event ) event.Skip(); } +wxDataViewItem wxDataViewMainWindow::GetSelection() +{ + if( m_selection.GetCount() != 1 ) + return wxDataViewItem(); + return GetItemByRow( m_selection.Item( 0 ) ); +} + //----------------------------------------------------------------------------- // wxDataViewCtrl //----------------------------------------------------------------------------- @@ -1684,7 +2971,8 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator ) { - if (!wxControl::Create( parent, id, pos, size, style | wxScrolledWindowStyle|wxSUNKEN_BORDER, validator)) + if (!wxControl::Create( parent, id, pos, size, + style | wxScrolledWindowStyle|wxSUNKEN_BORDER, validator)) return false; Init(); @@ -1694,16 +2982,17 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, #endif m_clientArea = new wxDataViewMainWindow( this, wxID_ANY ); -#ifdef __WXMSW__ - m_headerArea = new wxDataViewHeaderWindow( this, wxID_ANY, wxDefaultPosition, wxSize(wxDefaultCoord,22) ); -#else - m_headerArea = new wxDataViewHeaderWindow( this, wxID_ANY, wxDefaultPosition, wxSize(wxDefaultCoord,25) ); -#endif + + if (HasFlag(wxDV_NO_HEADER)) + m_headerArea = NULL; + else + m_headerArea = new wxDataViewHeaderWindow( this, wxID_ANY ); SetTargetWindow( m_clientArea ); wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL ); - sizer->Add( m_headerArea, 0, wxGROW ); + if (m_headerArea) + sizer->Add( m_headerArea, 0, wxGROW ); sizer->Add( m_clientArea, 1, wxGROW ); SetSizer( sizer ); @@ -1743,15 +3032,17 @@ void wxDataViewCtrl::OnSize( wxSizeEvent &WXUNUSED(event) ) AdjustScrollbars(); } -bool wxDataViewCtrl::AssociateModel( wxDataViewListModel *model ) +bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model ) { if (!wxDataViewCtrlBase::AssociateModel( model )) return false; - m_notifier = new wxGenericDataViewListModelNotifier( m_clientArea ); + m_notifier = new wxGenericDataViewModelNotifier( m_clientArea ); model->AddNotifier( m_notifier ); + m_clientArea->BuildTree(model); + m_clientArea->UpdateDisplay(); return true; @@ -1762,11 +3053,75 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col ) if (!wxDataViewCtrlBase::AppendColumn(col)) return false; + OnColumnChange(); + return true; +} + +void wxDataViewCtrl::OnColumnChange() +{ + if (m_headerArea) + m_headerArea->UpdateDisplay(); + m_clientArea->UpdateDisplay(); +} - return true; +void wxDataViewCtrl::DoSetExpanderColumn() +{ + m_clientArea->UpdateDisplay(); } +void wxDataViewCtrl::DoSetIndent() +{ + m_clientArea->UpdateDisplay(); +} + +wxDataViewItem wxDataViewCtrl::GetSelection() +{ + return m_clientArea->GetSelection(); +} + +/******************************************************************** +void wxDataViewCtrl::SetSelection( int row ) +{ + m_clientArea->SelectRow(row, true); +} + +void wxDataViewCtrl::SetSelectionRange( unsigned int from, unsigned int to ) +{ + m_clientArea->SelectRows(from, to, true); +} + +void wxDataViewCtrl::SetSelections( const wxArrayInt& aSelections ) +{ + m_clientArea->Select(aSelections); +} + +void wxDataViewCtrl::Unselect( unsigned int WXUNUSED(row) ) +{ + // FIXME - TODO +} + +bool wxDataViewCtrl::IsSelected( unsigned int WXUNUSED(row) ) const +{ + // FIXME - TODO + + return false; +} + +int wxDataViewCtrl::GetSelection() const +{ + // FIXME - TODO + + return -1; +} + +int wxDataViewCtrl::GetSelections(wxArrayInt& WXUNUSED(aSelections) ) const +{ + // FIXME - TODO + + return 0; +} +*********************************************************************/ #endif // !wxUSE_GENERICDATAVIEWCTRL