X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b3feaa75de76963492c4202be04be9bf20b321f..032bc940fcde34cc649eaa111cd6aff1cda66104:/src/generic/datavgen.cpp?ds=sidebyside diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 63e64dbdd4..771dab7a47 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: datavgen.cpp +// Name: src/generic/datavgen.cpp // Purpose: wxDataViewCtrl generic implementation // Author: Robert Roebling // Id: $Id$ @@ -10,7 +10,9 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/defs.h" +#ifdef __BORLANDC__ + #pragma hdrstop +#endif #if wxUSE_DATAVIEWCTRL @@ -18,18 +20,24 @@ #ifdef wxUSE_GENERICDATAVIEWCTRL +#ifndef WX_PRECOMP + #ifdef __WXMSW__ + #include "wx/msw/wrapwin.h" + #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" +#endif + #include "wx/stockitem.h" -#include "wx/dcclient.h" #include "wx/calctrl.h" #include "wx/popupwin.h" -#include "wx/sizer.h" -#include "wx/log.h" #include "wx/renderer.h" - -#ifdef __WXMSW__ - #include // for DLGC_WANTARROWS - #include "wx/msw/winundef.h" -#endif +#include "wx/dcbuffer.h" +#include "wx/icon.h" //----------------------------------------------------------------------------- // classes @@ -37,222 +45,432 @@ class wxDataViewCtrl; -// --------------------------------------------------------- +//----------------------------------------------------------------------------- +// wxDataViewHeaderWindow +//----------------------------------------------------------------------------- + +class wxDataViewHeaderWindow: public wxWindow +{ +public: + wxDataViewHeaderWindow( wxDataViewCtrl *parent, + wxWindowID id, + const wxPoint &pos = wxDefaultPosition, + const wxSize &size = wxDefaultSize, + const wxString &name = wxT("wxdataviewctrlheaderwindow") ); + virtual ~wxDataViewHeaderWindow(); + + void SetOwner( wxDataViewCtrl* owner ) { m_owner = owner; } + wxDataViewCtrl *GetOwner() { return m_owner; } + + void OnPaint( wxPaintEvent &event ); + void OnMouse( wxMouseEvent &event ); + void OnSetFocus( wxFocusEvent &event ); + +private: + wxDataViewCtrl *m_owner; + wxCursor *m_resizeCursor; + +private: + DECLARE_DYNAMIC_CLASS(wxDataViewHeaderWindow) + DECLARE_EVENT_TABLE() +}; + +//----------------------------------------------------------------------------- +// wxDataViewRenameTimer +//----------------------------------------------------------------------------- + +class wxDataViewRenameTimer: public wxTimer +{ +private: + wxDataViewMainWindow *m_owner; + +public: + wxDataViewRenameTimer( wxDataViewMainWindow *owner ); + void Notify(); +}; + +//----------------------------------------------------------------------------- +// wxDataViewTextCtrlWrapper: wraps a wxTextCtrl for inline editing +//----------------------------------------------------------------------------- + +class wxDataViewTextCtrlWrapper : public wxEvtHandler +{ +public: + // NB: text must be a valid object but not Create()d yet + wxDataViewTextCtrlWrapper( wxDataViewMainWindow *owner, + wxTextCtrl *text, + wxDataViewListModel *model, + unsigned int col, unsigned int 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(); + +private: + wxDataViewMainWindow *m_owner; + wxTextCtrl *m_text; + wxString m_startValue; + wxDataViewListModel *m_model; + unsigned int m_col; + unsigned int m_row; + bool m_finished; + bool m_aboutToFinish; + + DECLARE_EVENT_TABLE() +}; + +//----------------------------------------------------------------------------- +// wxDataViewMainWindow +//----------------------------------------------------------------------------- + +WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_SIZE_T(unsigned int, wxDataViewSelection, WXDLLIMPEXP_ADV); + +class wxDataViewMainWindow: public wxWindow +{ +public: + wxDataViewMainWindow( wxDataViewCtrl *parent, + wxWindowID id, + const wxPoint &pos = wxDefaultPosition, + const wxSize &size = wxDefaultSize, + const wxString &name = wxT("wxdataviewctrlmainwindow") ); + virtual ~wxDataViewMainWindow(); + + // notifications from wxDataViewListModel + bool RowAppended(); + bool RowPrepended(); + bool RowInserted( unsigned int before ); + bool RowDeleted( unsigned int row ); + bool RowChanged( unsigned int row ); + bool ValueChanged( unsigned int col, unsigned int row ); + bool RowsReordered( unsigned int *new_order ); + bool Cleared(); + + void SetOwner( wxDataViewCtrl* owner ) { m_owner = owner; } + wxDataViewCtrl *GetOwner() { return m_owner; } + + void OnPaint( wxPaintEvent &event ); + void OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event); + void OnChar( wxKeyEvent &event ); + void OnMouse( wxMouseEvent &event ); + void OnSetFocus( wxFocusEvent &event ); + void OnKillFocus( wxFocusEvent &event ); + + void UpdateDisplay(); + void RecalculateDisplay(); + void OnInternalIdle(); + + void OnRenameTimer(); + void FinishEditing( wxTextCtrl *text ); + + void ScrollWindow( int dx, int dy, const wxRect *rect ); + + bool HasCurrentRow() { return m_currentRow != (unsigned int)-1; } + void ChangeCurrentRow( unsigned int row ); + + bool IsSingleSel() const { return !GetParent()->HasFlag(wxDV_MULTIPLE); }; + bool IsEmpty() { return GetRowCount() == 0; } + + int GetCountPerPage(); + int GetEndOfLastCol(); + unsigned int GetFirstVisibleRow(); + unsigned int GetLastVisibleRow(); + unsigned int GetRowCount(); + + void SelectAllRows( bool on ); + 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( unsigned int row ); + void RefreshRows( unsigned int from, unsigned int to ); + void RefreshRowsAfter( unsigned int firstRow ); + +private: + wxDataViewCtrl *m_owner; + int m_lineHeight; + bool m_dirty; + + wxDataViewColumn *m_currentCol; + unsigned int m_currentRow; + wxDataViewSelection m_selection; + + wxDataViewRenameTimer *m_renameTimer; + wxDataViewTextCtrlWrapper *m_textctrlWrapper; + bool m_lastOnSame; + + bool m_hasFocus; + + int m_dragCount; + wxPoint m_dragStart; + + // for double click logic + unsigned int m_lineLastClicked, + m_lineBeforeLastClicked, + m_lineSelectSingleOnUp; + +private: + DECLARE_DYNAMIC_CLASS(wxDataViewMainWindow) + DECLARE_EVENT_TABLE() +}; + +// --------------------------------------------------------- // wxGenericDataViewListModelNotifier -// --------------------------------------------------------- +// --------------------------------------------------------- class wxGenericDataViewListModelNotifier: public wxDataViewListModelNotifier { public: - wxGenericDataViewListModelNotifier( wxDataViewListModel *wx_model ); - - virtual bool RowAppended(); - virtual bool RowPrepended(); - virtual bool RowInserted( size_t before ); - virtual bool RowDeleted( size_t row ); - virtual bool RowChanged( size_t row ); - virtual bool ValueChanged( size_t col, size_t row ); - virtual bool RowsReordered( size_t *new_order ); - virtual bool Cleared(); - - wxDataViewListModel *m_wx_model; + wxGenericDataViewListModelNotifier( wxDataViewMainWindow *mainWindow ) + { m_mainWindow = mainWindow; } + + virtual bool RowAppended() + { return m_mainWindow->RowAppended(); } + virtual bool RowPrepended() + { return m_mainWindow->RowPrepended(); } + virtual bool RowInserted( unsigned int before ) + { return m_mainWindow->RowInserted( before ); } + virtual bool RowDeleted( unsigned int row ) + { return m_mainWindow->RowDeleted( row ); } + virtual bool RowChanged( unsigned int row ) + { return m_mainWindow->RowChanged( row ); } + virtual bool ValueChanged( unsigned int col, unsigned int row ) + { return m_mainWindow->ValueChanged( col, row ); } + virtual bool RowsReordered( unsigned int *new_order ) + { return m_mainWindow->RowsReordered( new_order ); } + virtual bool Cleared() + { return m_mainWindow->Cleared(); } + + wxDataViewMainWindow *m_mainWindow; }; -// --------------------------------------------------------- -// wxGenericDataViewListModelNotifier -// --------------------------------------------------------- +// --------------------------------------------------------- +// wxDataViewRenderer +// --------------------------------------------------------- + +IMPLEMENT_ABSTRACT_CLASS(wxDataViewRenderer, wxDataViewRendererBase) -wxGenericDataViewListModelNotifier::wxGenericDataViewListModelNotifier( - wxDataViewListModel *wx_model ) +wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, wxDataViewCellMode mode ) : + wxDataViewRendererBase( varianttype, mode ) { - m_wx_model = wx_model; + m_dc = NULL; } - -bool wxGenericDataViewListModelNotifier::RowAppended() + +wxDataViewRenderer::~wxDataViewRenderer() { - size_t pos = m_wx_model->GetNumberOfRows()-1; - - return false; + if (m_dc) + delete m_dc; } -bool wxGenericDataViewListModelNotifier::RowPrepended() +wxDC *wxDataViewRenderer::GetDC() { - return false; + if (m_dc == NULL) + { + if (GetOwner() == NULL) + return NULL; + if (GetOwner()->GetOwner() == NULL) + return NULL; + m_dc = new wxClientDC( GetOwner()->GetOwner() ); + } + + return m_dc; } -bool wxGenericDataViewListModelNotifier::RowInserted( size_t before ) +// --------------------------------------------------------- +// wxDataViewCustomRenderer +// --------------------------------------------------------- + +IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer) + +wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype, + wxDataViewCellMode mode ) : + wxDataViewRenderer( varianttype, mode ) { - return false; } -bool wxGenericDataViewListModelNotifier::RowDeleted( size_t row ) +// --------------------------------------------------------- +// wxDataViewTextRenderer +// --------------------------------------------------------- + +IMPLEMENT_CLASS(wxDataViewTextRenderer, wxDataViewCustomRenderer) + +wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, wxDataViewCellMode mode ) : + wxDataViewCustomRenderer( varianttype, mode ) { - return false; } -bool wxGenericDataViewListModelNotifier::RowChanged( size_t row ) +bool wxDataViewTextRenderer::SetValue( const wxVariant &value ) { + m_text = value.GetString(); + return true; } -bool wxGenericDataViewListModelNotifier::ValueChanged( size_t model_col, size_t model_row ) +bool wxDataViewTextRenderer::GetValue( wxVariant& WXUNUSED(value) ) { - wxNode *node = GetOwner()->m_viewingColumns.GetFirst(); - while (node) - { - wxDataViewViewingColumn* viewing_column = (wxDataViewViewingColumn*) node->GetData(); - if (viewing_column->m_modelColumn == model_col) - { - - } - - node = node->GetNext(); - } - return false; } -bool wxGenericDataViewListModelNotifier::RowsReordered( size_t *new_order ) +bool wxDataViewTextRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) { - wxNode *node = GetOwner()->m_viewingColumns.GetFirst(); - while (node) - { - wxDataViewViewingColumn* viewing_column = (wxDataViewViewingColumn*) node->GetData(); + dc->DrawText( m_text, cell.x, cell.y ); - node = node->GetNext(); - } - - return false; + return true; } -bool wxGenericDataViewListModelNotifier::Cleared() +wxSize wxDataViewTextRenderer::GetSize() { - return false; + return wxSize(80,20); } -// --------------------------------------------------------- -// wxDataViewCell -// --------------------------------------------------------- +// --------------------------------------------------------- +// wxDataViewBitmapRenderer +// --------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxDataViewCell, wxDataViewCellBase) +IMPLEMENT_CLASS(wxDataViewBitmapRenderer, wxDataViewCustomRenderer) -wxDataViewCell::wxDataViewCell( const wxString &varianttype, wxDataViewCellMode mode ) : - wxDataViewCellBase( varianttype, mode ) +wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype, wxDataViewCellMode mode ) : + wxDataViewCustomRenderer( varianttype, mode ) { } -// --------------------------------------------------------- -// wxDataViewTextCell -// --------------------------------------------------------- +bool wxDataViewBitmapRenderer::SetValue( const wxVariant &value ) +{ + if (value.GetType() == wxT("wxBitmap")) + m_bitmap << value; + if (value.GetType() == wxT("wxIcon")) + m_icon << value; -IMPLEMENT_ABSTRACT_CLASS(wxDataViewTextCell, wxDataViewCell) + return true; +} -wxDataViewTextCell::wxDataViewTextCell( const wxString &varianttype, wxDataViewCellMode mode ) : - wxDataViewCell( varianttype, mode ) +bool wxDataViewBitmapRenderer::GetValue( wxVariant& WXUNUSED(value) ) { + return false; } -bool wxDataViewTextCell::SetValue( const wxVariant &value ) +bool wxDataViewBitmapRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) { - return false; + 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; } -bool wxDataViewTextCell::GetValue( wxVariant &value ) +wxSize wxDataViewBitmapRenderer::GetSize() { - return false; + 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); } -// --------------------------------------------------------- -// wxDataViewToggleCell -// --------------------------------------------------------- +// --------------------------------------------------------- +// wxDataViewToggleRenderer +// --------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleCell, wxDataViewCell) +IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleRenderer, wxDataViewCustomRenderer) -wxDataViewToggleCell::wxDataViewToggleCell( const wxString &varianttype, +wxDataViewToggleRenderer::wxDataViewToggleRenderer( const wxString &varianttype, wxDataViewCellMode mode ) : - wxDataViewCell( varianttype, mode ) + wxDataViewCustomRenderer( varianttype, mode ) { + m_toggle = false; } -bool wxDataViewToggleCell::SetValue( const wxVariant &value ) +bool wxDataViewToggleRenderer::SetValue( const wxVariant &value ) { - return false; + m_toggle = value.GetBool(); + + return true; } -bool wxDataViewToggleCell::GetValue( wxVariant &value ) +bool wxDataViewToggleRenderer::GetValue( wxVariant &WXUNUSED(value) ) { return false; } - -// --------------------------------------------------------- -// wxDataViewCustomCell -// --------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomCell, wxDataViewCell) - -wxDataViewCustomCell::wxDataViewCustomCell( const wxString &varianttype, - wxDataViewCellMode mode ) : - wxDataViewCell( varianttype, mode ) +bool wxDataViewToggleRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) { - m_dc = NULL; - - Init(); -} + // User wxRenderer here + + wxRect rect; + rect.x = cell.x + cell.width/2 - 10; + rect.width = 20; + rect.y = cell.y + cell.height/2 - 10; + rect.height = 20; + + int flags = 0; + if (m_toggle) + flags |= wxCONTROL_CHECKED; + if (GetMode() != wxDATAVIEW_CELL_ACTIVATABLE) + flags |= wxCONTROL_DISABLED; + + wxRendererNative::Get().DrawCheckBox( + GetOwner()->GetOwner(), + *dc, + rect, + flags ); -bool wxDataViewCustomCell::Init() -{ - return false; + return true; } -wxDataViewCustomCell::~wxDataViewCustomCell() +bool wxDataViewToggleRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewListModel *model, unsigned int col, unsigned int row ) { - if (m_dc) - delete m_dc; + bool value = !m_toggle; + wxVariant variant = value; + model->SetValue( variant, col, row ); + model->ValueChanged( col, row ); + return true; } -wxDC *wxDataViewCustomCell::GetDC() +wxSize wxDataViewToggleRenderer::GetSize() { - if (m_dc == NULL) - { - if (GetOwner() == NULL) - return NULL; - if (GetOwner()->GetOwner() == NULL) - return NULL; - m_dc = new wxClientDC( GetOwner()->GetOwner() ); - } - - return m_dc; + return wxSize(20,20); } - -// --------------------------------------------------------- -// wxDataViewProgressCell -// --------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressCell, wxDataViewCustomCell) +// --------------------------------------------------------- +// wxDataViewProgressRenderer +// --------------------------------------------------------- -wxDataViewProgressCell::wxDataViewProgressCell( const wxString &label, +IMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressRenderer, wxDataViewCustomRenderer) + +wxDataViewProgressRenderer::wxDataViewProgressRenderer( const wxString &label, const wxString &varianttype, wxDataViewCellMode mode ) : - wxDataViewCustomCell( varianttype, mode ) + wxDataViewCustomRenderer( varianttype, mode ) { 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; - + if (m_value < 0) m_value = 0; if (m_value > 100) m_value = 100; - + return true; } - -bool wxDataViewProgressCell::Render( wxRect cell, wxDC *dc, int state ) + +bool wxDataViewProgressRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) { double pct = (double)m_value / 100.0; wxRect bar = cell; @@ -264,56 +482,59 @@ bool wxDataViewProgressCell::Render( wxRect cell, wxDC *dc, int state ) dc->SetBrush( *wxTRANSPARENT_BRUSH ); dc->SetPen( *wxBLACK_PEN ); dc->DrawRectangle( cell ); - + return true; } -wxSize wxDataViewProgressCell::GetSize() +wxSize wxDataViewProgressRenderer::GetSize() { return wxSize(40,12); } - -// --------------------------------------------------------- -// wxDataViewDateCell -// --------------------------------------------------------- -class wxDataViewDateCellPopupTransient: public wxPopupTransientWindow +// --------------------------------------------------------- +// wxDataViewDateRenderer +// --------------------------------------------------------- + +#if wxUSE_CALENDARCTRL + +class wxDataViewDateRendererPopupTransient: public wxPopupTransientWindow { -public: - wxDataViewDateCellPopupTransient( wxWindow* parent, wxDateTime *value, - wxDataViewListModel *model, size_t col, size_t row ) : +public: + wxDataViewDateRendererPopupTransient( wxWindow* parent, wxDateTime *value, + wxDataViewListModel *model, unsigned int col, unsigned int row ) : wxPopupTransientWindow( parent, wxBORDER_SIMPLE ) { m_model = model; m_col = col; m_row = row; - m_cal = new wxCalendarCtrl( this, -1, *value ); + m_cal = new wxCalendarCtrl( this, wxID_ANY, *value ); wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL ); sizer->Add( m_cal, 1, wxGROW ); SetSizer( sizer ); sizer->Fit( this ); } - + + void OnCalendar( wxCalendarEvent &event ); + + wxCalendarCtrl *m_cal; + wxDataViewListModel *m_model; + unsigned int m_col; + unsigned int m_row; + +protected: virtual void OnDismiss() { } - - void OnCalendar( wxCalendarEvent &event ); - - wxCalendarCtrl *m_cal; - wxDataViewListModel *m_model; - size_t m_col; - size_t m_row; - + private: DECLARE_EVENT_TABLE() }; -BEGIN_EVENT_TABLE(wxDataViewDateCellPopupTransient,wxPopupTransientWindow) - EVT_CALENDAR( -1, 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; @@ -322,22 +543,24 @@ void wxDataViewDateCellPopupTransient::OnCalendar( wxCalendarEvent &event ) DismissAndNotify(); } -IMPLEMENT_ABSTRACT_CLASS(wxDataViewDateCell, wxDataViewCustomCell) +#endif // wxUSE_CALENDARCTRL -wxDataViewDateCell::wxDataViewDateCell( const wxString &varianttype, +IMPLEMENT_ABSTRACT_CLASS(wxDataViewDateRenderer, wxDataViewCustomRenderer) + +wxDataViewDateRenderer::wxDataViewDateRenderer( const wxString &varianttype, wxDataViewCellMode mode ) : - wxDataViewCustomCell( varianttype, mode ) + wxDataViewCustomRenderer( varianttype, mode ) { } - -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 state ) +bool wxDataViewDateRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) { dc->SetFont( GetOwner()->GetOwner()->GetFont() ); wxString tmp = m_date.FormatDate(); @@ -346,7 +569,7 @@ bool wxDataViewDateCell::Render( wxRect cell, wxDC *dc, int state ) return true; } -wxSize wxDataViewDateCell::GetSize() +wxSize wxDataViewDateRenderer::GetSize() { wxDataViewCtrl* view = GetOwner()->GetOwner(); wxString tmp = m_date.FormatDate(); @@ -355,35 +578,77 @@ wxSize wxDataViewDateCell::GetSize() return wxSize(x,y+d); } -bool wxDataViewDateCell::Activate( wxRect cell, wxDataViewListModel *model, size_t col, size_t row ) +bool wxDataViewDateRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewListModel *model, unsigned int col, unsigned int row ) { wxVariant variant; model->GetValue( variant, col, row ); wxDateTime value = variant.GetDateTime(); - wxDataViewDateCellPopupTransient *popup = new wxDataViewDateCellPopupTransient( +#if wxUSE_CALENDARCTRL + wxDataViewDateRendererPopupTransient *popup = new wxDataViewDateRendererPopupTransient( GetOwner()->GetOwner()->GetParent(), &value, model, col, row ); wxPoint pos = wxGetMousePosition(); popup->Move( pos ); popup->Layout(); popup->Popup( popup->m_cal ); - +#else + wxMessageBox(value.Format()); +#endif return true; } -// --------------------------------------------------------- +// --------------------------------------------------------- // wxDataViewColumn -// --------------------------------------------------------- +// --------------------------------------------------------- IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumn, wxDataViewColumnBase) -wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewCell *cell, - size_t model_column, int flags ) : - wxDataViewColumnBase( title, cell, model_column, flags ) +wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *cell, unsigned int model_column, + int width, int flags ) : + wxDataViewColumnBase( title, cell, model_column, width, flags ) +{ + m_width = width; + if (m_width < 0) + m_width = 80; +} + +wxDataViewColumn::wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *cell, unsigned int model_column, + int width, int flags ) : + wxDataViewColumnBase( bitmap, cell, model_column, width, flags ) +{ + m_width = width; + if (m_width < 0) + m_width = 30; +} + +void wxDataViewColumn::SetAlignment( wxAlignment WXUNUSED(align) ) +{ + // TODO +} + +void wxDataViewColumn::SetSortable( bool WXUNUSED(sortable) ) +{ + // TODO +} + +bool wxDataViewColumn::GetSortable() +{ + // TODO + return false; +} + +void wxDataViewColumn::SetSortOrder( bool WXUNUSED(ascending) ) +{ + // TODO +} + +bool wxDataViewColumn::IsSortOrderAscending() { - m_width = 80; + // TODO + return true; } + wxDataViewColumn::~wxDataViewColumn() { } @@ -391,38 +656,23 @@ wxDataViewColumn::~wxDataViewColumn() void wxDataViewColumn::SetTitle( const wxString &title ) { wxDataViewColumnBase::SetTitle( title ); - -} -//----------------------------------------------------------------------------- -// wxDataViewHeaderWindow -//----------------------------------------------------------------------------- +} -class wxDataViewHeaderWindow: public wxWindow +void wxDataViewColumn::SetBitmap( const wxBitmap &bitmap ) { -public: - wxDataViewHeaderWindow( wxDataViewCtrl *parent, - wxWindowID id, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - const wxString &name = wxT("wxdataviewctrlheaderwindow") ); - ~wxDataViewHeaderWindow(); + wxDataViewColumnBase::SetBitmap( bitmap ); - void SetOwner( wxDataViewCtrl* owner ) { m_owner = owner; } - wxDataViewCtrl *GetOwner() { return m_owner; } +} - void OnPaint( wxPaintEvent &event ); - void OnMouse( wxMouseEvent &event ); - void OnSetFocus( wxFocusEvent &event ); - -private: - wxDataViewCtrl *m_owner; - wxCursor *m_resizeCursor; - -private: - DECLARE_DYNAMIC_CLASS(wxDataViewHeaderWindow) - DECLARE_EVENT_TABLE() -}; +int wxDataViewColumn::GetWidth() +{ + return m_width; +} + +//----------------------------------------------------------------------------- +// wxDataViewHeaderWindow +//----------------------------------------------------------------------------- IMPLEMENT_ABSTRACT_CLASS(wxDataViewHeaderWindow, wxWindow) @@ -439,8 +689,9 @@ wxDataViewHeaderWindow::wxDataViewHeaderWindow( wxDataViewCtrl *parent, wxWindow SetOwner( parent ); m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE ); - + wxVisualAttributes attr = wxPanel::GetClassDefaultAttributes(); + SetBackgroundStyle( wxBG_STYLE_CUSTOM ); SetOwnForegroundColour( attr.colFg ); SetOwnBackgroundColour( attr.colBg ); if (!m_hasFont) @@ -452,13 +703,16 @@ wxDataViewHeaderWindow::~wxDataViewHeaderWindow() delete m_resizeCursor; } -void wxDataViewHeaderWindow::OnPaint( wxPaintEvent &event ) +void wxDataViewHeaderWindow::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 ); @@ -467,86 +721,213 @@ void wxDataViewHeaderWindow::OnPaint( wxPaintEvent &event ) // account for the horz scrollbar offset dc.SetDeviceOrigin( -x * xpix, 0 ); - + dc.SetFont( GetFont() ); - - size_t cols = GetOwner()->GetNumberOfColumns(); - size_t i; + + unsigned int cols = GetOwner()->GetNumberOfColumns(); + unsigned int i; int xpos = 0; for (i = 0; i < cols; i++) { wxDataViewColumn *col = GetOwner()->GetColumn( i ); int width = col->GetWidth(); - - // the width of the rect to draw: make it smaller to fit entirely - // inside the column rect -#ifdef __WXMAC__ + int cw = width; int ch = h; -#else - int cw = width - 2; - int ch = h - 2; -#endif wxRendererNative::Get().DrawHeaderButton ( this, dc, - wxRect(xpos, 0, cw, ch), + wxRect(xpos, 0, cw, ch-1), m_parent->IsEnabled() ? 0 : (int)wxCONTROL_DISABLED ); - dc.DrawText( col->GetTitle(), xpos+3, 3 ); - + dc.DrawText( col->GetTitle(), xpos+3, 3 ); + xpos += width; } } -void wxDataViewHeaderWindow::OnMouse( wxMouseEvent &event ) +void wxDataViewHeaderWindow::OnMouse( wxMouseEvent &WXUNUSED(event) ) { } void wxDataViewHeaderWindow::OnSetFocus( wxFocusEvent &event ) { + GetParent()->SetFocus(); event.Skip(); } //----------------------------------------------------------------------------- -// wxDataViewMainWindow +// wxDataViewRenameTimer //----------------------------------------------------------------------------- -class wxDataViewMainWindow: public wxWindow +wxDataViewRenameTimer::wxDataViewRenameTimer( wxDataViewMainWindow *owner ) { -public: - wxDataViewMainWindow( wxDataViewCtrl *parent, - wxWindowID id, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - const wxString &name = wxT("wxdataviewctrlmainwindow") ); - ~wxDataViewMainWindow(); + m_owner = owner; +} - void SetOwner( wxDataViewCtrl* owner ) { m_owner = owner; } - wxDataViewCtrl *GetOwner() { return m_owner; } +void wxDataViewRenameTimer::Notify() +{ + m_owner->OnRenameTimer(); +} + +//----------------------------------------------------------------------------- +// wxDataViewTextCtrlWrapper: wraps a wxTextCtrl for inline editing +//----------------------------------------------------------------------------- + +BEGIN_EVENT_TABLE(wxDataViewTextCtrlWrapper, wxEvtHandler) + EVT_CHAR (wxDataViewTextCtrlWrapper::OnChar) + EVT_KEY_UP (wxDataViewTextCtrlWrapper::OnKeyUp) + EVT_KILL_FOCUS (wxDataViewTextCtrlWrapper::OnKillFocus) +END_EVENT_TABLE() + +wxDataViewTextCtrlWrapper::wxDataViewTextCtrlWrapper( + wxDataViewMainWindow *owner, + wxTextCtrl *text, + wxDataViewListModel *model, + unsigned int col, unsigned int row, + wxRect rectLabel ) +{ + m_owner = owner; + m_model = model; + m_row = row; + m_col = col; + m_text = text; + + m_finished = false; + m_aboutToFinish = false; + + wxVariant value; + model->GetValue( value, col, row ); + m_startValue = value.GetString(); + + m_owner->GetOwner()->CalcScrolledPosition( + rectLabel.x, rectLabel.y, &rectLabel.x, &rectLabel.y ); + + 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(); + + m_text->PushEventHandler(this); +} + +void wxDataViewTextCtrlWrapper::AcceptChangesAndFinish() +{ + m_aboutToFinish = true; + + // Notify the owner about the changes + AcceptChanges(); + + // Even if vetoed, close the control (consistent with MSW) + Finish(); +} + +void wxDataViewTextCtrlWrapper::OnChar( wxKeyEvent &event ) +{ + switch ( event.m_keyCode ) + { + case WXK_RETURN: + AcceptChangesAndFinish(); + break; + + case WXK_ESCAPE: + // m_owner->OnRenameCancelled( m_itemEdited ); + Finish(); + break; + + default: + event.Skip(); + } +} + +void wxDataViewTextCtrlWrapper::OnKeyUp( wxKeyEvent &event ) +{ + if (m_finished) + { + event.Skip(); + return; + } + + // 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); + + event.Skip(); +} + +void wxDataViewTextCtrlWrapper::OnKillFocus( wxFocusEvent &event ) +{ + if ( !m_finished && !m_aboutToFinish ) + { + AcceptChanges(); + //if ( !AcceptChanges() ) + // m_owner->OnRenameCancelled( m_itemEdited ); + + Finish(); + } + + // We must let the native text control handle focus + event.Skip(); +} + +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; + + // accepted, do rename the item + wxVariant variant; + variant = value; + m_model->SetValue( variant, m_col, m_row ); + m_model->ValueChanged( m_col, m_row ); + + return true; +} + +void wxDataViewTextCtrlWrapper::Finish() +{ + if ( !m_finished ) + { + m_finished = true; + + m_text->RemoveEventHandler(this); + m_owner->FinishEditing(m_text); + + // delete later + wxPendingDelete.Append( this ); + } +} + +//----------------------------------------------------------------------------- +// wxDataViewMainWindow +//----------------------------------------------------------------------------- + +int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 ) +{ + if (row1 > row2) return 1; + if (row1 == row2) return 0; + return -1; +} - void OnPaint( wxPaintEvent &event ); - void OnMouse( wxMouseEvent &event ); - void OnSetFocus( wxFocusEvent &event ); - - void UpdateDisplay(); - void RecalculateDisplay(); - void OnInternalIdle(); - - void ScrollWindow( int dx, int dy, const wxRect *rect ); -private: - wxDataViewCtrl *m_owner; - int m_lineHeight; - bool m_dirty; - -private: - DECLARE_DYNAMIC_CLASS(wxDataViewMainWindow) - DECLARE_EVENT_TABLE() -}; IMPLEMENT_ABSTRACT_CLASS(wxDataViewMainWindow, wxWindow) @@ -554,22 +935,127 @@ BEGIN_EVENT_TABLE(wxDataViewMainWindow,wxWindow) EVT_PAINT (wxDataViewMainWindow::OnPaint) EVT_MOUSE_EVENTS (wxDataViewMainWindow::OnMouse) EVT_SET_FOCUS (wxDataViewMainWindow::OnSetFocus) + EVT_KILL_FOCUS (wxDataViewMainWindow::OnKillFocus) + EVT_CHAR (wxDataViewMainWindow::OnChar) END_EVENT_TABLE() wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, const wxString &name ) : - wxWindow( parent, id, pos, size, 0, name ) + wxWindow( parent, id, pos, size, wxWANTS_CHARS, name ), + m_selection( wxDataViewSelectionCmp ) + { SetOwner( parent ); - - // We need to calculate this smartly.. + + 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_dragCount = 0; + m_dragStart = wxPoint(0,0); + m_lineLastClicked = (unsigned int) -1; + m_lineBeforeLastClicked = (unsigned int) -1; + m_lineSelectSingleOnUp = (unsigned int) -1; + + m_hasFocus = false; + + SetBackgroundStyle( wxBG_STYLE_CUSTOM ); + SetBackgroundColour( *wxWHITE ); + UpdateDisplay(); } wxDataViewMainWindow::~wxDataViewMainWindow() { + delete m_renameTimer; +} + +void wxDataViewMainWindow::OnRenameTimer() +{ + // We have to call this here because changes may just have + // been made and no screen update taken place. + if ( m_dirty ) + wxSafeYield(); + + + int xpos = 0; + unsigned int cols = GetOwner()->GetNumberOfColumns(); + unsigned int i; + for (i = 0; i < cols; i++) + { + wxDataViewColumn *c = GetOwner()->GetColumn( i ); + if (c == m_currentCol) + break; + xpos += c->GetWidth(); + } + 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 ); +} + +void wxDataViewMainWindow::FinishEditing( wxTextCtrl *text ) +{ + delete text; + m_textctrlWrapper = NULL; + SetFocus(); + // SetFocusIgnoringChildren(); +} + +bool wxDataViewMainWindow::RowAppended() +{ + return false; +} + +bool wxDataViewMainWindow::RowPrepended() +{ + return false; +} + +bool wxDataViewMainWindow::RowInserted( unsigned int WXUNUSED(before) ) +{ + return false; +} + +bool wxDataViewMainWindow::RowDeleted( unsigned int WXUNUSED(row) ) +{ + return false; +} + +bool wxDataViewMainWindow::RowChanged( unsigned int WXUNUSED(row) ) +{ + return false; +} + +bool wxDataViewMainWindow::ValueChanged( unsigned int WXUNUSED(col), unsigned int row ) +{ + wxRect rect( 0, row*m_lineHeight, 10000, m_lineHeight ); + m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); + Refresh( true, &rect ); + + return true; +} + +bool wxDataViewMainWindow::RowsReordered( unsigned int *WXUNUSED(new_order) ) +{ + Refresh(); + + return true; +} + +bool wxDataViewMainWindow::Cleared() +{ + return false; } void wxDataViewMainWindow::UpdateDisplay() @@ -580,7 +1066,7 @@ void wxDataViewMainWindow::UpdateDisplay() void wxDataViewMainWindow::OnInternalIdle() { wxWindow::OnInternalIdle(); - + if (m_dirty) { RecalculateDisplay(); @@ -596,21 +1082,21 @@ void wxDataViewMainWindow::RecalculateDisplay() Refresh(); return; } - + int width = 0; - size_t cols = GetOwner()->GetNumberOfColumns(); - size_t i; + unsigned int cols = GetOwner()->GetNumberOfColumns(); + unsigned int i; for (i = 0; i < cols; i++) { wxDataViewColumn *col = GetOwner()->GetColumn( i ); width += col->GetWidth(); } - + int height = model->GetNumberOfRows() * m_lineHeight; SetVirtualSize( width, height ); GetOwner()->SetScrollRate( 10, m_lineHeight ); - + Refresh(); } @@ -620,24 +1106,646 @@ void wxDataViewMainWindow::ScrollWindow( int dx, int dy, const wxRect *rect ) GetOwner()->m_headerArea->ScrollWindow( dx, 0 ); } -void wxDataViewMainWindow::OnPaint( wxPaintEvent &event ) +void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) { - wxPaintDC dc( this ); + wxAutoBufferedPaintDC dc( this ); + + dc.SetBackground(GetBackgroundColour()); + dc.Clear(); GetOwner()->PrepareDC( dc ); dc.SetFont( GetFont() ); - - dc.DrawText( wxT("main window"), 5, 5 ); + + wxRect update = GetUpdateRegion().GetBox(); + m_owner->CalcUnscrolledPosition( update.x, update.y, &update.x, &update.y ); + + wxDataViewListModel *model = GetOwner()->GetModel(); + + 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)(model->GetNumberOfRows()-item_start) ); + + + + unsigned int item; + for (item = item_start; item < item_start+item_count; item++) + { + if (m_selection.Index( item ) != wxNOT_FOUND) + { + int flags = wxCONTROL_SELECTED; + if (item == m_currentRow) + flags |= wxCONTROL_CURRENT; + if (m_hasFocus) + flags |= wxCONTROL_FOCUSED; + wxRect rect( 0, item*m_lineHeight+1, GetEndOfLastCol(), m_lineHeight-2 ); + wxRendererNative::Get().DrawItemSelectionRect + ( + this, + dc, + rect, + 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 + ); + + } + } + } + + wxRect cell_rect; + cell_rect.x = 0; + cell_rect.height = m_lineHeight; + unsigned int cols = GetOwner()->GetNumberOfColumns(); + unsigned int i; + for (i = 0; i < cols; i++) + { + wxDataViewColumn *col = GetOwner()->GetColumn( i ); + wxDataViewRenderer *cell = col->GetRenderer(); + cell_rect.width = col->GetWidth(); + + for (item = item_start; item < item_start+item_count; item++) + { + cell_rect.y = item*m_lineHeight; + wxVariant value; + model->GetValue( value, col->GetModelColumn(), item ); + cell->SetValue( value ); + 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 ); + } + + cell_rect.x += cell_rect.width; + } +} + +int wxDataViewMainWindow::GetCountPerPage() +{ + wxSize size = GetClientSize(); + return size.y / m_lineHeight; +} + +int wxDataViewMainWindow::GetEndOfLastCol() +{ + int width = 0; + unsigned int i; + for (i = 0; i < GetOwner()->GetNumberOfColumns(); i++) + { + wxDataViewColumn *c = GetOwner()->GetColumn( i ); + width += c->GetWidth(); + } + return width; +} + +unsigned int wxDataViewMainWindow::GetFirstVisibleRow() +{ + int x = 0; + int y = 0; + m_owner->CalcUnscrolledPosition( x, y, &x, &y ); + + return y / m_lineHeight; +} + +unsigned int wxDataViewMainWindow::GetLastVisibleRow() +{ + wxSize client_size = GetClientSize(); + 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 ); +} + +unsigned int wxDataViewMainWindow::GetRowCount() +{ + return GetOwner()->GetModel()->GetNumberOfRows(); +} + +void wxDataViewMainWindow::ChangeCurrentRow( unsigned int row ) +{ + m_currentRow = row; + + // send event +} + +void wxDataViewMainWindow::SelectAllRows( bool on ) +{ + if (IsEmpty()) + return; + + if (on) + { + m_selection.Clear(); + for (unsigned int i = 0; i < GetRowCount(); i++) + m_selection.Add( i ); + Refresh(); + } + else + { + unsigned int first_visible = GetFirstVisibleRow(); + unsigned int last_visible = GetLastVisibleRow(); + unsigned int i; + for (i = 0; i < m_selection.GetCount(); i++) + { + unsigned int row = m_selection[i]; + if ((row >= first_visible) && (row <= last_visible)) + RefreshRow( row ); + } + m_selection.Clear(); + } +} + +void wxDataViewMainWindow::SelectRow( unsigned int row, bool on ) +{ + if (m_selection.Index( row ) == wxNOT_FOUND) + { + if (on) + { + m_selection.Add( row ); + RefreshRow( row ); + } + } + else + { + if (!on) + { + m_selection.Remove( row ); + RefreshRow( row ); + } + } +} + +void wxDataViewMainWindow::SelectRows( unsigned int from, unsigned int to, bool on ) +{ + if (from > to) + { + unsigned int tmp = from; + from = to; + to = tmp; + } + + unsigned int i; + for (i = from; i <= to; i++) + { + if (m_selection.Index( i ) == wxNOT_FOUND) + { + if (on) + m_selection.Add( i ); + } + else + { + if (!on) + m_selection.Remove( i ); + } + } + RefreshRows( from, to ); +} + +void wxDataViewMainWindow::ReverseRowSelection( unsigned int row ) +{ + if (m_selection.Index( row ) == wxNOT_FOUND) + m_selection.Add( row ); + else + m_selection.Remove( row ); + RefreshRow( row ); +} + +bool wxDataViewMainWindow::IsRowSelected( unsigned int row ) +{ + return (m_selection.Index( row ) != wxNOT_FOUND); +} + +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 ); + + wxSize client_size = GetClientSize(); + wxRect client_rect( 0, 0, client_size.x, client_size.y ); + wxRect intersect_rect = client_rect.Intersect( rect ); + if (intersect_rect.width > 0) + Refresh( true, &intersect_rect ); +} + +void wxDataViewMainWindow::RefreshRows( unsigned int from, unsigned int to ) +{ + if (from > to) + { + unsigned int tmp = to; + to = from; + from = tmp; + } + + wxRect rect( 0, from*m_lineHeight, GetEndOfLastCol(), (to-from+1) * m_lineHeight ); + m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); + + wxSize client_size = GetClientSize(); + wxRect client_rect( 0, 0, client_size.x, client_size.y ); + wxRect intersect_rect = client_rect.Intersect( rect ); + if (intersect_rect.width > 0) + Refresh( true, &intersect_rect ); +} + +void wxDataViewMainWindow::RefreshRowsAfter( unsigned int firstRow ) +{ + unsigned int count = GetRowCount(); + if (firstRow > count) + return; + + wxRect rect( 0, firstRow*m_lineHeight, GetEndOfLastCol(), count * m_lineHeight ); + m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); + + wxSize client_size = GetClientSize(); + wxRect client_rect( 0, 0, client_size.x, client_size.y ); + wxRect intersect_rect = client_rect.Intersect( rect ); + if (intersect_rect.width > 0) + Refresh( true, &intersect_rect ); +} + +void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event) +{ + wxCHECK_RET( newCurrent < GetRowCount(), + _T("invalid item index in OnArrowChar()") ); + + // if there is no selection, we cannot move it anywhere + if (!HasCurrentRow()) + return; + + unsigned int oldCurrent = m_currentRow; + + // in single selection we just ignore Shift as we can't select several + // items anyhow + if ( event.ShiftDown() && !IsSingleSel() ) + { + RefreshRow( oldCurrent ); + + ChangeCurrentRow( newCurrent ); + + // select all the items between the old and the new one + if ( oldCurrent > newCurrent ) + { + newCurrent = oldCurrent; + oldCurrent = m_currentRow; + } + + SelectRows( oldCurrent, newCurrent, true ); + } + else // !shift + { + RefreshRow( oldCurrent ); + + // all previously selected items are unselected unless ctrl is held + if ( !event.ControlDown() ) + SelectAllRows(false); + + ChangeCurrentRow( newCurrent ); + + if ( !event.ControlDown() ) + SelectRow( m_currentRow, true ); + else + RefreshRow( m_currentRow ); + } + + // MoveToFocus(); +} + +void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) +{ + if (event.GetKeyCode() == WXK_TAB) + { + wxNavigationKeyEvent nevent; + nevent.SetWindowChange( event.ControlDown() ); + nevent.SetDirection( !event.ShiftDown() ); + nevent.SetEventObject( GetParent()->GetParent() ); + nevent.SetCurrentFocus( m_parent ); + if (GetParent()->GetParent()->GetEventHandler()->ProcessEvent( nevent )) + return; + } + + // no item -> nothing to do + if (!HasCurrentRow()) + { + event.Skip(); + return; + } + + // don't use m_linesPerPage directly as it might not be computed yet + const int pageSize = GetCountPerPage(); + wxCHECK_RET( pageSize, _T("should have non zero page size") ); + + switch ( event.GetKeyCode() ) + { + case WXK_UP: + if ( m_currentRow > 0 ) + OnArrowChar( m_currentRow - 1, event ); + break; + + case WXK_DOWN: + if ( m_currentRow < GetRowCount() - 1 ) + OnArrowChar( m_currentRow + 1, event ); + break; + + case WXK_END: + if (!IsEmpty()) + OnArrowChar( GetRowCount() - 1, event ); + break; + + case WXK_HOME: + if (!IsEmpty()) + OnArrowChar( 0, event ); + break; + + case WXK_PAGEUP: + { + int steps = pageSize - 1; + int index = m_currentRow - steps; + if (index < 0) + index = 0; + + OnArrowChar( index, event ); + } + break; + + case WXK_PAGEDOWN: + { + int steps = pageSize - 1; + unsigned int index = m_currentRow + steps; + unsigned int count = GetRowCount(); + if ( index >= count ) + index = count - 1; + + OnArrowChar( index, event ); + } + break; + + default: + event.Skip(); + } } void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) { - event.Skip(); + if (event.GetEventType() == wxEVT_MOUSEWHEEL) + { + // let the base handle mouse wheel events. + event.Skip(); + return; + } + + int x = event.GetX(); + int y = event.GetY(); + m_owner->CalcUnscrolledPosition( x, y, &x, &y ); + + wxDataViewColumn *col = NULL; + + int xpos = 0; + unsigned int cols = GetOwner()->GetNumberOfColumns(); + unsigned int i; + for (i = 0; i < cols; i++) + { + wxDataViewColumn *c = GetOwner()->GetColumn( i ); + if (x < xpos + c->GetWidth()) + { + col = c; + break; + } + xpos += c->GetWidth(); + } + if (!col) + return; + wxDataViewRenderer *cell = col->GetRenderer(); + + unsigned int current = y / m_lineHeight; + + if ((current > GetRowCount()) || (x > GetEndOfLastCol())) + { + // Unselect all if below the last row ? + return; + } + + wxDataViewListModel *model = GetOwner()->GetModel(); + + if (event.Dragging()) + { + if (m_dragCount == 0) + { + // we have to report the raw, physical coords as we want to be + // able to call HitTest(event.m_pointDrag) from the user code to + // get the item being dragged + m_dragStart = event.GetPosition(); + } + + m_dragCount++; + + if (m_dragCount != 3) + return; + + if (event.LeftIsDown()) + { + // Notify cell about drag + } + return; + } + else + { + m_dragCount = 0; + } + + bool forceClick = false; + + if (event.ButtonDClick()) + { + m_renameTimer->Stop(); + m_lastOnSame = false; + } + + if (event.LeftDClick()) + { + if ( current == m_lineLastClicked ) + { + if (cell->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE) + { + wxVariant value; + model->GetValue( value, col->GetModelColumn(), current ); + cell->SetValue( value ); + wxRect cell_rect( xpos, current * m_lineHeight, col->GetWidth(), m_lineHeight ); + cell->Activate( cell_rect, model, col->GetModelColumn(), current ); + } + return; + } + else + { + // The first click was on another item, so don't interpret this as + // a double click, but as a simple click instead + forceClick = true; + } + } + + if (event.LeftUp()) + { + if (m_lineSelectSingleOnUp != (unsigned int)-1) + { + // select single line + SelectAllRows( false ); + SelectRow( m_lineSelectSingleOnUp, true ); + } + + if (m_lastOnSame) + { + if ((col == m_currentCol) && (current == m_currentRow) && + (cell->GetMode() == wxDATAVIEW_CELL_EDITABLE) ) + { + m_renameTimer->Start( 100, true ); + } + } + + m_lastOnSame = false; + m_lineSelectSingleOnUp = (unsigned int)-1; + } + else + { + // This is necessary, because after a DnD operation in + // 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 = (unsigned int)-1; + } + + if (event.RightDown()) + { + m_lineBeforeLastClicked = m_lineLastClicked; + m_lineLastClicked = current; + + // If the item is already selected, do not update the selection. + // Multi-selections should not be cleared if a selected item is clicked. + if (!IsRowSelected(current)) + { + SelectAllRows(false); + ChangeCurrentRow(current); + SelectRow(m_currentRow,true); + } + + // notify cell about right click + // cell->... + + // Allow generation of context menu event + event.Skip(); + } + else if (event.MiddleDown()) + { + // notify cell about middle click + // cell->... + } + if (event.LeftDown() || forceClick) + { +#ifdef __WXMSW__ + SetFocus(); +#endif + + m_lineBeforeLastClicked = m_lineLastClicked; + m_lineLastClicked = current; + + unsigned int oldCurrentRow = m_currentRow; + bool oldWasSelected = IsRowSelected(m_currentRow); + + bool cmdModifierDown = event.CmdDown(); + if ( IsSingleSel() || !(cmdModifierDown || event.ShiftDown()) ) + { + if ( IsSingleSel() || !IsRowSelected(current) ) + { + SelectAllRows( false ); + + ChangeCurrentRow(current); + + SelectRow(m_currentRow,true); + } + else // multi sel & current is highlighted & no mod keys + { + m_lineSelectSingleOnUp = current; + ChangeCurrentRow(current); // change focus + } + } + else // multi sel & either ctrl or shift is down + { + if (cmdModifierDown) + { + ChangeCurrentRow(current); + + ReverseRowSelection(m_currentRow); + } + else if (event.ShiftDown()) + { + ChangeCurrentRow(current); + + unsigned int lineFrom = oldCurrentRow, + lineTo = current; + + if ( lineTo < lineFrom ) + { + lineTo = lineFrom; + lineFrom = m_currentRow; + } + + SelectRows(lineFrom, lineTo, true); + } + else // !ctrl, !shift + { + // test in the enclosing if should make it impossible + wxFAIL_MSG( _T("how did we get here?") ); + } + } + + if (m_currentRow != oldCurrentRow) + RefreshRow( oldCurrentRow ); + + wxDataViewColumn *oldCurrentCol = m_currentCol; + + // Update selection here... + m_currentCol = col; + + m_lastOnSame = !forceClick && ((col == oldCurrentCol) && (current == oldCurrentRow)) && oldWasSelected; + } } void wxDataViewMainWindow::OnSetFocus( wxFocusEvent &event ) { + m_hasFocus = true; + + if (HasCurrentRow()) + Refresh(); + + event.Skip(); +} + +void wxDataViewMainWindow::OnKillFocus( wxFocusEvent &event ) +{ + m_hasFocus = false; + + if (HasCurrentRow()) + Refresh(); + event.Skip(); } @@ -663,23 +1771,27 @@ void wxDataViewCtrl::Init() } bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos, const wxSize& size, + const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator ) { if (!wxControl::Create( parent, id, pos, size, style | wxScrolledWindowStyle|wxSUNKEN_BORDER, validator)) return false; Init(); - + #ifdef __WXMAC__ MacSetClipChildren( true ) ; #endif - m_clientArea = new wxDataViewMainWindow( this, -1 ); - m_headerArea = new wxDataViewHeaderWindow( this, -1, wxDefaultPosition, wxSize(-1,25) ); - + 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 + SetTargetWindow( m_clientArea ); - + wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL ); sizer->Add( m_headerArea, 0, wxGROW ); sizer->Add( m_clientArea, 1, wxGROW ); @@ -693,7 +1805,7 @@ WXLRESULT wxDataViewCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { - WXLRESULT rc = wxPanel::MSWWindowProc(nMsg, wParam, lParam); + WXLRESULT rc = wxDataViewCtrlBase::MSWWindowProc(nMsg, wParam, lParam); #ifndef __WXWINCE__ // we need to process arrows ourselves for scrolling @@ -707,7 +1819,7 @@ WXLRESULT wxDataViewCtrl::MSWWindowProc(WXUINT nMsg, } #endif -void wxDataViewCtrl::OnSize( wxSizeEvent &event ) +void wxDataViewCtrl::OnSize( wxSizeEvent &WXUNUSED(event) ) { // We need to override OnSize so that our scrolled // window a) does call Layout() to use sizers for @@ -726,12 +1838,12 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewListModel *model ) if (!wxDataViewCtrlBase::AssociateModel( model )) return false; - m_notifier = new wxGenericDataViewListModelNotifier( model ); + m_notifier = new wxGenericDataViewListModelNotifier( m_clientArea ); - model->AddNotifier( m_notifier ); + model->AddNotifier( m_notifier ); m_clientArea->UpdateDisplay(); - + return true; } @@ -739,15 +1851,55 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col ) { if (!wxDataViewCtrlBase::AppendColumn(col)) return false; - + m_clientArea->UpdateDisplay(); - + return true; } -#endif +void wxDataViewCtrl::SetSelection( int WXUNUSED(row) ) +{ + // FIXME - TODO +} + +void wxDataViewCtrl::SetSelectionRange( unsigned int WXUNUSED(from), unsigned int WXUNUSED(to) ) +{ + // FIXME - TODO +} + +void wxDataViewCtrl::SetSelections( const wxArrayInt& WXUNUSED(aSelections) ) +{ + // FIXME - TODO +} + +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 -#endif +#endif // wxUSE_DATAVIEWCTRL -