X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/45778c96d414a31853b273a0445f6038ce5568c0..d4445d24d33828580f8bf2a1215ef906f70adb51:/src/generic/datavgen.cpp diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 41af9707f1..0471851d99 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,25 +10,25 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/defs.h" - #if wxUSE_DATAVIEWCTRL #include "wx/dataview.h" #ifdef wxUSE_GENERICDATAVIEWCTRL +#ifndef WX_PRECOMP + #include "wx/sizer.h" + #include "wx/log.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" + #include "wx/msw/wrapwin.h" #endif //----------------------------------------------------------------------------- @@ -37,202 +37,267 @@ class wxDataViewCtrl; -// --------------------------------------------------------- -// wxGenericDataViewListModelNotifier -// --------------------------------------------------------- +//----------------------------------------------------------------------------- +// wxDataViewHeaderWindow +//----------------------------------------------------------------------------- -class wxGenericDataViewListModelNotifier: public wxDataViewListModelNotifier +class wxDataViewHeaderWindow: public wxWindow { 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; + wxDataViewHeaderWindow( wxDataViewCtrl *parent, + wxWindowID id, + const wxPoint &pos = wxDefaultPosition, + const wxSize &size = wxDefaultSize, + const wxString &name = wxT("wxdataviewctrlheaderwindow") ); + ~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() }; -// --------------------------------------------------------- -// wxGenericDataViewListModelNotifier -// --------------------------------------------------------- +//----------------------------------------------------------------------------- +// wxDataViewMainWindow +//----------------------------------------------------------------------------- -wxGenericDataViewListModelNotifier::wxGenericDataViewListModelNotifier( - wxDataViewListModel *wx_model ) -{ - m_wx_model = wx_model; -} - -bool wxGenericDataViewListModelNotifier::RowAppended() +class wxDataViewMainWindow: public wxWindow { - size_t pos = m_wx_model->GetNumberOfRows()-1; - - return false; -} +public: + wxDataViewMainWindow( wxDataViewCtrl *parent, + wxWindowID id, + const wxPoint &pos = wxDefaultPosition, + const wxSize &size = wxDefaultSize, + const wxString &name = wxT("wxdataviewctrlmainwindow") ); + ~wxDataViewMainWindow(); -bool wxGenericDataViewListModelNotifier::RowPrepended() -{ - return false; -} + // 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 ); + bool Cleared(); -bool wxGenericDataViewListModelNotifier::RowInserted( size_t before ) -{ - return false; -} + void SetOwner( wxDataViewCtrl* owner ) { m_owner = owner; } + wxDataViewCtrl *GetOwner() { return m_owner; } + + void OnPaint( wxPaintEvent &event ); + void OnMouse( wxMouseEvent &event ); + void OnSetFocus( wxFocusEvent &event ); -bool wxGenericDataViewListModelNotifier::RowDeleted( size_t row ) + 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() +}; + +// --------------------------------------------------------- +// wxGenericDataViewListModelNotifier +// --------------------------------------------------------- + +class wxGenericDataViewListModelNotifier: public wxDataViewListModelNotifier { - return false; -} +public: + wxGenericDataViewListModelNotifier( 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 Cleared() + { return m_mainWindow->Cleared(); } + + wxDataViewMainWindow *m_mainWindow; +}; + +// --------------------------------------------------------- +// wxDataViewCell +// --------------------------------------------------------- + +IMPLEMENT_ABSTRACT_CLASS(wxDataViewCell, wxDataViewCellBase) -bool wxGenericDataViewListModelNotifier::RowChanged( size_t row ) +wxDataViewCell::wxDataViewCell( const wxString &varianttype, wxDataViewCellMode mode ) : + wxDataViewCellBase( varianttype, mode ) { - return true; + m_dc = NULL; } -bool wxGenericDataViewListModelNotifier::ValueChanged( size_t model_col, size_t model_row ) +wxDataViewCell::~wxDataViewCell() { - 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; + if (m_dc) + delete m_dc; } -bool wxGenericDataViewListModelNotifier::RowsReordered( size_t *new_order ) +wxDC *wxDataViewCell::GetDC() { - wxNode *node = GetOwner()->m_viewingColumns.GetFirst(); - while (node) + if (m_dc == NULL) { - wxDataViewViewingColumn* viewing_column = (wxDataViewViewingColumn*) node->GetData(); - - node = node->GetNext(); + if (GetOwner() == NULL) + return NULL; + if (GetOwner()->GetOwner() == NULL) + return NULL; + m_dc = new wxClientDC( GetOwner()->GetOwner() ); } - - return false; -} -bool wxGenericDataViewListModelNotifier::Cleared() -{ - return false; + return m_dc; } -// --------------------------------------------------------- -// wxDataViewCell -// --------------------------------------------------------- +// --------------------------------------------------------- +// wxDataViewCustomCell +// --------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxDataViewCell, wxDataViewCellBase) +IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomCell, wxDataViewCell) -wxDataViewCell::wxDataViewCell( const wxString &varianttype, wxDataViewCellMode mode ) : - wxDataViewCellBase( varianttype, mode ) +wxDataViewCustomCell::wxDataViewCustomCell( const wxString &varianttype, + wxDataViewCellMode mode ) : + wxDataViewCell( varianttype, mode ) { } -// --------------------------------------------------------- +// --------------------------------------------------------- // wxDataViewTextCell -// --------------------------------------------------------- +// --------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxDataViewTextCell, wxDataViewCell) +IMPLEMENT_ABSTRACT_CLASS(wxDataViewTextCell, wxDataViewCustomCell) wxDataViewTextCell::wxDataViewTextCell( const wxString &varianttype, wxDataViewCellMode mode ) : - wxDataViewCell( varianttype, mode ) + wxDataViewCustomCell( varianttype, mode ) { } bool wxDataViewTextCell::SetValue( const wxVariant &value ) { - return false; + m_text = value.GetString(); + + return true; } -bool wxDataViewTextCell::GetValue( wxVariant &value ) +bool wxDataViewTextCell::GetValue( wxVariant& WXUNUSED(value) ) { return false; } -// --------------------------------------------------------- +bool wxDataViewTextCell::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) +{ + dc->DrawText( m_text, cell.x, cell.y ); + + return true; +} + +wxSize wxDataViewTextCell::GetSize() +{ + return wxSize(80,20); +} + +// --------------------------------------------------------- // wxDataViewToggleCell -// --------------------------------------------------------- +// --------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleCell, wxDataViewCell) +IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleCell, wxDataViewCustomCell) -wxDataViewToggleCell::wxDataViewToggleCell( const wxString &varianttype, +wxDataViewToggleCell::wxDataViewToggleCell( const wxString &varianttype, wxDataViewCellMode mode ) : - wxDataViewCell( varianttype, mode ) + wxDataViewCustomCell( varianttype, mode ) { + m_toggle = false; } bool wxDataViewToggleCell::SetValue( const wxVariant &value ) { - return false; + m_toggle = value.GetBool(); + + return true;; } -bool wxDataViewToggleCell::GetValue( wxVariant &value ) +bool wxDataViewToggleCell::GetValue( wxVariant &WXUNUSED(value) ) { return false; } - -// --------------------------------------------------------- -// wxDataViewCustomCell -// --------------------------------------------------------- - -IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomCell, wxDataViewCell) -wxDataViewCustomCell::wxDataViewCustomCell( const wxString &varianttype, - wxDataViewCellMode mode ) : - wxDataViewCell( varianttype, mode ) +bool wxDataViewToggleCell::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) { - m_dc = NULL; - - Init(); -} + // User wxRenderer here -bool wxDataViewCustomCell::Init() -{ - return false; + if (GetMode() == wxDATAVIEW_CELL_ACTIVATABLE) + dc->SetPen( *wxBLACK_PEN ); + else + dc->SetPen( *wxGREY_PEN ); + dc->SetBrush( *wxTRANSPARENT_BRUSH ); + wxRect rect; + rect.x = cell.x + cell.width/2 - 10; + rect.width = 20; + rect.y = cell.y + cell.height/2 - 10; + rect.height = 20; + dc->DrawRectangle( rect ); + if (m_toggle) + { + rect.x += 2; + rect.y += 2; + rect.width -= 4; + rect.height -= 4; + dc->DrawLine( rect.x, rect.y, rect.x+rect.width, rect.y+rect.height ); + dc->DrawLine( rect.x+rect.width, rect.y, rect.x, rect.y+rect.height ); + } + + return true; } -wxDataViewCustomCell::~wxDataViewCustomCell() +bool wxDataViewToggleCell::Activate( wxRect WXUNUSED(cell), wxDataViewListModel *model, size_t col, size_t 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 wxDataViewToggleCell::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) -wxDataViewProgressCell::wxDataViewProgressCell( const wxString &label, +wxDataViewProgressCell::wxDataViewProgressCell( const wxString &label, const wxString &varianttype, wxDataViewCellMode mode ) : - wxDataViewCustomCell( varianttype, mode ) + wxDataViewCustomCell( varianttype, mode ) { m_label = label; m_value = 0; @@ -245,14 +310,14 @@ wxDataViewProgressCell::~wxDataViewProgressCell() bool wxDataViewProgressCell::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 wxDataViewProgressCell::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) { double pct = (double)m_value / 100.0; wxRect bar = cell; @@ -264,7 +329,7 @@ bool wxDataViewProgressCell::Render( wxRect cell, wxDC *dc, int state ) dc->SetBrush( *wxTRANSPARENT_BRUSH ); dc->SetPen( *wxBLACK_PEN ); dc->DrawRectangle( cell ); - + return true; } @@ -272,14 +337,14 @@ wxSize wxDataViewProgressCell::GetSize() { return wxSize(40,12); } - -// --------------------------------------------------------- + +// --------------------------------------------------------- // wxDataViewDateCell -// --------------------------------------------------------- +// --------------------------------------------------------- class wxDataViewDateCellPopupTransient: public wxPopupTransientWindow { -public: +public: wxDataViewDateCellPopupTransient( wxWindow* parent, wxDateTime *value, wxDataViewListModel *model, size_t col, size_t row ) : wxPopupTransientWindow( parent, wxBORDER_SIMPLE ) @@ -287,30 +352,30 @@ public: 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 ); } - + virtual void OnDismiss() { } - + void OnCalendar( wxCalendarEvent &event ); - + wxCalendarCtrl *m_cal; - wxDataViewListModel *m_model; + 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 ) + EVT_CALENDAR( wxID_ANY, wxDataViewDateCellPopupTransient::OnCalendar ) END_EVENT_TABLE() void wxDataViewDateCellPopupTransient::OnCalendar( wxCalendarEvent &event ) @@ -329,15 +394,15 @@ wxDataViewDateCell::wxDataViewDateCell( const wxString &varianttype, wxDataViewCustomCell( varianttype, mode ) { } - + bool wxDataViewDateCell::SetValue( const wxVariant &value ) { m_date = value.GetDateTime(); - + return true; } -bool wxDataViewDateCell::Render( wxRect cell, wxDC *dc, int state ) +bool wxDataViewDateCell::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) { dc->SetFont( GetOwner()->GetOwner()->GetFont() ); wxString tmp = m_date.FormatDate(); @@ -355,13 +420,13 @@ wxSize wxDataViewDateCell::GetSize() return wxSize(x,y+d); } -bool wxDataViewDateCell::Activate( wxRect cell, wxDataViewListModel *model, size_t col, size_t row ) +bool wxDataViewDateCell::Activate( wxRect WXUNUSED(cell), wxDataViewListModel *model, size_t col, size_t row ) { wxVariant variant; model->GetValue( variant, col, row ); wxDateTime value = variant.GetDateTime(); - wxDataViewDateCellPopupTransient *popup = new wxDataViewDateCellPopupTransient( + wxDataViewDateCellPopupTransient *popup = new wxDataViewDateCellPopupTransient( GetOwner()->GetOwner()->GetParent(), &value, model, col, row ); wxPoint pos = wxGetMousePosition(); popup->Move( pos ); @@ -371,16 +436,17 @@ bool wxDataViewDateCell::Activate( wxRect cell, wxDataViewListModel *model, size return true; } -// --------------------------------------------------------- +// --------------------------------------------------------- // wxDataViewColumn -// --------------------------------------------------------- +// --------------------------------------------------------- IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumn, wxDataViewColumnBase) -wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewCell *cell, +wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewCell *cell, size_t model_column, int flags ) : wxDataViewColumnBase( title, cell, model_column, flags ) { + m_width = 80; } wxDataViewColumn::~wxDataViewColumn() @@ -390,39 +456,13 @@ wxDataViewColumn::~wxDataViewColumn() void wxDataViewColumn::SetTitle( const wxString &title ) { wxDataViewColumnBase::SetTitle( title ); - + } //----------------------------------------------------------------------------- // wxDataViewHeaderWindow //----------------------------------------------------------------------------- -class wxDataViewHeaderWindow: public wxWindow -{ -public: - wxDataViewHeaderWindow( wxDataViewCtrl *parent, - wxWindowID id, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - const wxString &name = wxT("wxdataviewctrlheaderwindow") ); - ~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() -}; - IMPLEMENT_ABSTRACT_CLASS(wxDataViewHeaderWindow, wxWindow) BEGIN_EVENT_TABLE(wxDataViewHeaderWindow,wxWindow) @@ -436,9 +476,9 @@ wxDataViewHeaderWindow::wxDataViewHeaderWindow( wxDataViewCtrl *parent, wxWindow wxWindow( parent, id, pos, size, 0, name ) { SetOwner( parent ); - + m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE ); - + wxVisualAttributes attr = wxPanel::GetClassDefaultAttributes(); SetOwnForegroundColour( attr.colFg ); SetOwnBackgroundColour( attr.colBg ); @@ -451,11 +491,13 @@ wxDataViewHeaderWindow::~wxDataViewHeaderWindow() delete m_resizeCursor; } -void wxDataViewHeaderWindow::OnPaint( wxPaintEvent &event ) +void wxDataViewHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) { - wxPaintDC dc; - PrepareDC( dc ); - + int w, h; + GetClientSize( &w, &h ); + + wxPaintDC dc( this ); + int xpix; m_owner->GetScrollPixelsPerUnit( &xpix, NULL ); @@ -464,13 +506,43 @@ void wxDataViewHeaderWindow::OnPaint( wxPaintEvent &event ) // account for the horz scrollbar offset dc.SetDeviceOrigin( -x * xpix, 0 ); - + dc.SetFont( GetFont() ); - - dc.DrawText( wxT("This is the header.."), 5, 5 ); + + size_t cols = GetOwner()->GetNumberOfColumns(); + size_t 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), + m_parent->IsEnabled() ? 0 + : (int)wxCONTROL_DISABLED + ); + + dc.DrawText( col->GetTitle(), xpos+3, 3 ); + + xpos += width; + } } -void wxDataViewHeaderWindow::OnMouse( wxMouseEvent &event ) +void wxDataViewHeaderWindow::OnMouse( wxMouseEvent &WXUNUSED(event) ) { } @@ -483,31 +555,6 @@ void wxDataViewHeaderWindow::OnSetFocus( wxFocusEvent &event ) // wxDataViewMainWindow //----------------------------------------------------------------------------- -class wxDataViewMainWindow: public wxWindow -{ -public: - wxDataViewMainWindow( wxDataViewCtrl *parent, - wxWindowID id, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - const wxString &name = wxT("wxdataviewctrlmainwindow") ); - ~wxDataViewMainWindow(); - - 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; - -private: - DECLARE_DYNAMIC_CLASS(wxDataViewMainWindow) - DECLARE_EVENT_TABLE() -}; - IMPLEMENT_ABSTRACT_CLASS(wxDataViewMainWindow, wxWindow) BEGIN_EVENT_TABLE(wxDataViewMainWindow,wxWindow) @@ -521,28 +568,205 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i wxWindow( parent, id, pos, size, 0, name ) { SetOwner( parent ); + + // We need to calculate this smartly.. + m_lineHeight = 20; + + UpdateDisplay(); } wxDataViewMainWindow::~wxDataViewMainWindow() { } -void wxDataViewMainWindow::OnPaint( wxPaintEvent &event ) +bool wxDataViewMainWindow::RowAppended() { - wxPaintDC dc( this ); + return false; +} + +bool wxDataViewMainWindow::RowPrepended() +{ + return false; +} + +bool wxDataViewMainWindow::RowInserted( size_t WXUNUSED(before) ) +{ + return false; +} + +bool wxDataViewMainWindow::RowDeleted( size_t WXUNUSED(row) ) +{ + return false; +} + +bool wxDataViewMainWindow::RowChanged( size_t WXUNUSED(row) ) +{ + return false; +} + +bool wxDataViewMainWindow::ValueChanged( size_t WXUNUSED(col), size_t 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( size_t *WXUNUSED(new_order) ) +{ + return false; +} + +bool wxDataViewMainWindow::Cleared() +{ + return false; +} + +void wxDataViewMainWindow::UpdateDisplay() +{ + m_dirty = true; +} + +void wxDataViewMainWindow::OnInternalIdle() +{ + wxWindow::OnInternalIdle(); + + if (m_dirty) + { + RecalculateDisplay(); + m_dirty = false; + } +} + +void wxDataViewMainWindow::RecalculateDisplay() +{ + wxDataViewListModel *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; + + SetVirtualSize( width, height ); + GetOwner()->SetScrollRate( 10, m_lineHeight ); + + Refresh(); +} + +void wxDataViewMainWindow::ScrollWindow( int dx, int dy, const wxRect *rect ) +{ + wxWindow::ScrollWindow( dx, dy, rect ); + GetOwner()->m_headerArea->ScrollWindow( dx, 0 ); +} - PrepareDC( dc ); +void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) +{ + wxPaintDC dc( this ); - int dev_x, dev_y; - m_owner->CalcScrolledPosition( 0, 0, &dev_x, &dev_y ); + 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(); + + size_t item_start = update.y / m_lineHeight; + size_t item_count = (update.height / m_lineHeight) + 1; + + 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++) + { + wxDataViewColumn *col = GetOwner()->GetColumn( i ); + wxDataViewCell *cell = col->GetCell(); + cell_rect.width = col->GetWidth(); + + size_t item; + 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; + } } void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) { + int x = event.GetX(); + int y = event.GetY(); + m_owner->CalcUnscrolledPosition( x, y, &x, &y ); + + wxDataViewColumn *col = NULL; + + int xpos = 0; + size_t cols = GetOwner()->GetNumberOfColumns(); + size_t 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; + wxDataViewCell *cell = col->GetCell(); + + size_t row = y / m_lineHeight; + + wxDataViewListModel *model = GetOwner()->GetModel(); + + if (event.LeftDClick()) + { + if (cell->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE) + { + wxVariant value; + model->GetValue( value, col->GetModelColumn(), row ); + cell->SetValue( value ); + wxRect cell_rect( xpos, row * m_lineHeight, col->GetWidth(), m_lineHeight ); + cell->Activate( cell_rect, model, col->GetModelColumn(), row ); + } + + return; + } + event.Skip(); } @@ -557,6 +781,10 @@ void wxDataViewMainWindow::OnSetFocus( wxFocusEvent &event ) IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase) +BEGIN_EVENT_TABLE(wxDataViewCtrl, wxDataViewCtrlBase) + EVT_SIZE(wxDataViewCtrl::OnSize) +END_EVENT_TABLE() + wxDataViewCtrl::~wxDataViewCtrl() { if (m_notifier) @@ -569,20 +797,23 @@ 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 ); + m_headerArea = new wxDataViewHeaderWindow( this, wxID_ANY, wxDefaultPosition, wxSize(wxDefaultCoord,25) ); + SetTargetWindow( m_clientArea ); - + wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL ); sizer->Add( m_headerArea, 0, wxGROW ); sizer->Add( m_clientArea, 1, wxGROW ); @@ -596,7 +827,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 @@ -610,10 +841,18 @@ WXLRESULT wxDataViewCtrl::MSWWindowProc(WXUINT nMsg, } #endif -void wxDataViewCtrl::ScrollWindow( int dx, int dy, const wxRect *rect ) +void wxDataViewCtrl::OnSize( wxSizeEvent &WXUNUSED(event) ) { - wxDataViewCtrlBase::ScrollWindow( dx, dy, rect ); - m_headerArea->ScrollWindow( dx, 0, rect ); + // We need to override OnSize so that our scrolled + // window a) does call Layout() to use sizers for + // positioning the controls but b) does not query + // the sizer for their size and use that for setting + // the scrollable area as set that ourselves by + // calling SetScrollbar() further down. + + Layout(); + + AdjustScrollbars(); } bool wxDataViewCtrl::AssociateModel( wxDataViewListModel *model ) @@ -621,9 +860,11 @@ 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; } @@ -632,13 +873,15 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col ) { if (!wxDataViewCtrlBase::AppendColumn(col)) return false; - + + m_clientArea->UpdateDisplay(); + return true; } -#endif +#endif // !wxUSE_GENERICDATAVIEWCTRL -#endif +#endif // wxUSE_DATAVIEWCTRL