X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0fcce6b9d9f343df09ba802d9e606da7c8f8a7d5..032bc940fcde34cc649eaa111cd6aff1cda66104:/src/generic/datavgen.cpp?ds=sidebyside diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 2ad27c525e..771dab7a47 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -10,6 +10,10 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + #if wxUSE_DATAVIEWCTRL #include "wx/dataview.h" @@ -17,20 +21,23 @@ #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/renderer.h" -#include "wx/timer.h" - -#ifdef __WXMSW__ - #include "wx/msw/wrapwin.h" -#endif +#include "wx/dcbuffer.h" +#include "wx/icon.h" //----------------------------------------------------------------------------- // classes @@ -50,7 +57,7 @@ public: const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxString &name = wxT("wxdataviewctrlheaderwindow") ); - ~wxDataViewHeaderWindow(); + virtual ~wxDataViewHeaderWindow(); void SetOwner( wxDataViewCtrl* owner ) { m_owner = owner; } wxDataViewCtrl *GetOwner() { return m_owner; } @@ -93,7 +100,7 @@ public: wxDataViewTextCtrlWrapper( wxDataViewMainWindow *owner, wxTextCtrl *text, wxDataViewListModel *model, - size_t col, size_t row, + unsigned int col, unsigned int row, wxRect cellLabel ); wxTextCtrl *GetText() const { return m_text; } @@ -113,8 +120,8 @@ private: wxTextCtrl *m_text; wxString m_startValue; wxDataViewListModel *m_model; - size_t m_col; - size_t m_row; + unsigned int m_col; + unsigned int m_row; bool m_finished; bool m_aboutToFinish; @@ -125,6 +132,8 @@ private: // wxDataViewMainWindow //----------------------------------------------------------------------------- +WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_SIZE_T(unsigned int, wxDataViewSelection, WXDLLIMPEXP_ADV); + class wxDataViewMainWindow: public wxWindow { public: @@ -133,24 +142,27 @@ public: const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxString &name = wxT("wxdataviewctrlmainwindow") ); - ~wxDataViewMainWindow(); + 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 ); + 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(); @@ -160,18 +172,52 @@ public: 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; - size_t m_currentRow; - + 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() @@ -191,15 +237,15 @@ public: { return m_mainWindow->RowAppended(); } virtual bool RowPrepended() { return m_mainWindow->RowPrepended(); } - virtual bool RowInserted( size_t before ) + virtual bool RowInserted( unsigned int before ) { return m_mainWindow->RowInserted( before ); } - virtual bool RowDeleted( size_t row ) + virtual bool RowDeleted( unsigned int row ) { return m_mainWindow->RowDeleted( row ); } - virtual bool RowChanged( size_t row ) + virtual bool RowChanged( unsigned int row ) { return m_mainWindow->RowChanged( row ); } - virtual bool ValueChanged( size_t col, size_t row ) + virtual bool ValueChanged( unsigned int col, unsigned int row ) { return m_mainWindow->ValueChanged( col, row ); } - virtual bool RowsReordered( size_t *new_order ) + virtual bool RowsReordered( unsigned int *new_order ) { return m_mainWindow->RowsReordered( new_order ); } virtual bool Cleared() { return m_mainWindow->Cleared(); } @@ -208,24 +254,24 @@ 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 ) : + wxDataViewRendererBase( varianttype, mode ) { m_dc = NULL; } -wxDataViewCell::~wxDataViewCell() +wxDataViewRenderer::~wxDataViewRenderer() { if (m_dc) delete m_dc; } -wxDC *wxDataViewCell::GetDC() +wxDC *wxDataViewRenderer::GetDC() { if (m_dc == NULL) { @@ -240,106 +286,149 @@ wxDC *wxDataViewCell::GetDC() } // --------------------------------------------------------- -// wxDataViewCustomCell +// wxDataViewCustomRenderer // --------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomCell, wxDataViewCell) +IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer) -wxDataViewCustomCell::wxDataViewCustomCell( const wxString &varianttype, +wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype, wxDataViewCellMode mode ) : - wxDataViewCell( varianttype, mode ) + wxDataViewRenderer( varianttype, mode ) { } // --------------------------------------------------------- -// 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 ) : + wxDataViewCustomRenderer( varianttype, mode ) { } -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) ) { return false; } -bool wxDataViewTextCell::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) +bool wxDataViewTextRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) { dc->DrawText( m_text, cell.x, cell.y ); return true; } -wxSize wxDataViewTextCell::GetSize() +wxSize wxDataViewTextRenderer::GetSize() { return wxSize(80,20); } // --------------------------------------------------------- -// wxDataViewToggleCell +// wxDataViewBitmapRenderer +// --------------------------------------------------------- + +IMPLEMENT_CLASS(wxDataViewBitmapRenderer, wxDataViewCustomRenderer) + +wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype, wxDataViewCellMode mode ) : + wxDataViewCustomRenderer( varianttype, mode ) +{ +} + +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) ) +{ + return false; +} + +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() +{ + 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(wxDataViewToggleCell, wxDataViewCustomCell) +IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleRenderer, wxDataViewCustomRenderer) -wxDataViewToggleCell::wxDataViewToggleCell( const wxString &varianttype, +wxDataViewToggleRenderer::wxDataViewToggleRenderer( const wxString &varianttype, wxDataViewCellMode mode ) : - wxDataViewCustomCell( varianttype, mode ) + wxDataViewCustomRenderer( varianttype, mode ) { m_toggle = false; } -bool wxDataViewToggleCell::SetValue( const wxVariant &value ) +bool wxDataViewToggleRenderer::SetValue( const wxVariant &value ) { m_toggle = value.GetBool(); - return true;; + return true; } -bool wxDataViewToggleCell::GetValue( wxVariant &WXUNUSED(value) ) +bool wxDataViewToggleRenderer::GetValue( wxVariant &WXUNUSED(value) ) { 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 - 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 ); + + int flags = 0; 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 ); - } + flags |= wxCONTROL_CHECKED; + if (GetMode() != wxDATAVIEW_CELL_ACTIVATABLE) + flags |= wxCONTROL_DISABLED; + + wxRendererNative::Get().DrawCheckBox( + GetOwner()->GetOwner(), + *dc, + rect, + flags ); return true; } -bool wxDataViewToggleCell::Activate( wxRect WXUNUSED(cell), wxDataViewListModel *model, size_t col, size_t row ) +bool wxDataViewToggleRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewListModel *model, unsigned int col, unsigned int row ) { bool value = !m_toggle; wxVariant variant = value; @@ -348,30 +437,30 @@ bool wxDataViewToggleCell::Activate( wxRect WXUNUSED(cell), wxDataViewListModel return true; } -wxSize wxDataViewToggleCell::GetSize() +wxSize wxDataViewToggleRenderer::GetSize() { return wxSize(20,20); } // --------------------------------------------------------- -// wxDataViewProgressCell +// wxDataViewProgressRenderer // --------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressCell, wxDataViewCustomCell) +IMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressRenderer, wxDataViewCustomRenderer) -wxDataViewProgressCell::wxDataViewProgressCell( const wxString &label, +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; @@ -381,7 +470,7 @@ bool wxDataViewProgressCell::SetValue( const wxVariant &value ) return true; } -bool wxDataViewProgressCell::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) +bool wxDataViewProgressRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) { double pct = (double)m_value / 100.0; wxRect bar = cell; @@ -397,20 +486,22 @@ bool wxDataViewProgressCell::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) return true; } -wxSize wxDataViewProgressCell::GetSize() +wxSize wxDataViewProgressRenderer::GetSize() { return wxSize(40,12); } // --------------------------------------------------------- -// wxDataViewDateCell +// wxDataViewDateRenderer // --------------------------------------------------------- -class wxDataViewDateCellPopupTransient: public wxPopupTransientWindow +#if wxUSE_CALENDARCTRL + +class wxDataViewDateRendererPopupTransient: public wxPopupTransientWindow { public: - wxDataViewDateCellPopupTransient( wxWindow* parent, wxDateTime *value, - wxDataViewListModel *model, size_t col, size_t row ) : + wxDataViewDateRendererPopupTransient( wxWindow* parent, wxDateTime *value, + wxDataViewListModel *model, unsigned int col, unsigned int row ) : wxPopupTransientWindow( parent, wxBORDER_SIMPLE ) { m_model = model; @@ -423,26 +514,27 @@ public: sizer->Fit( this ); } - virtual void OnDismiss() - { - } - void OnCalendar( wxCalendarEvent &event ); wxCalendarCtrl *m_cal; wxDataViewListModel *m_model; - size_t m_col; - size_t m_row; + unsigned int m_col; + unsigned int m_row; + +protected: + virtual void OnDismiss() + { + } 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; @@ -451,22 +543,24 @@ void wxDataViewDateCellPopupTransient::OnCalendar( wxCalendarEvent &event ) DismissAndNotify(); } -IMPLEMENT_ABSTRACT_CLASS(wxDataViewDateCell, wxDataViewCustomCell) +#endif // wxUSE_CALENDARCTRL + +IMPLEMENT_ABSTRACT_CLASS(wxDataViewDateRenderer, wxDataViewCustomRenderer) -wxDataViewDateCell::wxDataViewDateCell( const wxString &varianttype, +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 WXUNUSED(state) ) +bool wxDataViewDateRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) { dc->SetFont( GetOwner()->GetOwner()->GetFont() ); wxString tmp = m_date.FormatDate(); @@ -475,7 +569,7 @@ bool wxDataViewDateCell::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) return true; } -wxSize wxDataViewDateCell::GetSize() +wxSize wxDataViewDateRenderer::GetSize() { wxDataViewCtrl* view = GetOwner()->GetOwner(); wxString tmp = m_date.FormatDate(); @@ -484,19 +578,22 @@ wxSize wxDataViewDateCell::GetSize() 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), 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; } @@ -506,13 +603,52 @@ 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 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() { - m_width = 80; + // TODO + return false; } +void wxDataViewColumn::SetSortOrder( bool WXUNUSED(ascending) ) +{ + // TODO +} + +bool wxDataViewColumn::IsSortOrderAscending() +{ + // TODO + return true; +} + + wxDataViewColumn::~wxDataViewColumn() { } @@ -523,6 +659,17 @@ void wxDataViewColumn::SetTitle( const wxString &title ) } +void wxDataViewColumn::SetBitmap( const wxBitmap &bitmap ) +{ + wxDataViewColumnBase::SetBitmap( bitmap ); + +} + +int wxDataViewColumn::GetWidth() +{ + return m_width; +} + //----------------------------------------------------------------------------- // wxDataViewHeaderWindow //----------------------------------------------------------------------------- @@ -544,6 +691,7 @@ wxDataViewHeaderWindow::wxDataViewHeaderWindow( wxDataViewCtrl *parent, wxWindow m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE ); wxVisualAttributes attr = wxPanel::GetClassDefaultAttributes(); + SetBackgroundStyle( wxBG_STYLE_CUSTOM ); SetOwnForegroundColour( attr.colFg ); SetOwnBackgroundColour( attr.colBg ); if (!m_hasFont) @@ -560,7 +708,10 @@ 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 ); @@ -573,29 +724,22 @@ void wxDataViewHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) 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 ); @@ -612,6 +756,7 @@ void wxDataViewHeaderWindow::OnMouse( wxMouseEvent &WXUNUSED(event) ) void wxDataViewHeaderWindow::OnSetFocus( wxFocusEvent &event ) { + GetParent()->SetFocus(); event.Skip(); } @@ -643,22 +788,22 @@ wxDataViewTextCtrlWrapper::wxDataViewTextCtrlWrapper( wxDataViewMainWindow *owner, wxTextCtrl *text, wxDataViewListModel *model, - size_t col, size_t row, + unsigned int col, unsigned int row, wxRect rectLabel ) { m_owner = owner; m_model = model; m_row = row; m_col = col; - m_text = text; - + 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 ); @@ -666,7 +811,7 @@ wxDataViewTextCtrlWrapper::wxDataViewTextCtrlWrapper( wxPoint(rectLabel.x-2,rectLabel.y-2), wxSize(rectLabel.width+7,rectLabel.height+4) ); m_text->SetFocus(); - + m_text->PushEventHandler(this); } @@ -729,7 +874,7 @@ void wxDataViewTextCtrlWrapper::OnKillFocus( wxFocusEvent &event ) AcceptChanges(); //if ( !AcceptChanges() ) // m_owner->OnRenameCancelled( m_itemEdited ); - + Finish(); } @@ -776,24 +921,36 @@ void wxDataViewTextCtrlWrapper::Finish() // wxDataViewMainWindow //----------------------------------------------------------------------------- +int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 ) +{ + if (row1 > row2) return 1; + if (row1 == row2) return 0; + return -1; +} + + IMPLEMENT_ABSTRACT_CLASS(wxDataViewMainWindow, wxWindow) 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 ); m_lastOnSame = false; m_renameTimer = new wxDataViewRenameTimer( this ); m_textctrlWrapper = NULL; - + // TODO: user better initial values/nothing selected m_currentCol = NULL; m_currentRow = 0; @@ -801,6 +958,17 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i // 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(); } @@ -818,8 +986,8 @@ void wxDataViewMainWindow::OnRenameTimer() int xpos = 0; - size_t cols = GetOwner()->GetNumberOfColumns(); - size_t i; + unsigned int cols = GetOwner()->GetNumberOfColumns(); + unsigned int i; for (i = 0; i < cols; i++) { wxDataViewColumn *c = GetOwner()->GetColumn( i ); @@ -832,7 +1000,7 @@ void wxDataViewMainWindow::OnRenameTimer() wxClassInfo *textControlClass = CLASSINFO(wxTextCtrl); wxTextCtrl * const text = (wxTextCtrl *)textControlClass->CreateObject(); - m_textctrlWrapper = new wxDataViewTextCtrlWrapper(this, text, GetOwner()->GetModel(), + m_textctrlWrapper = new wxDataViewTextCtrlWrapper(this, text, GetOwner()->GetModel(), m_currentCol->GetModelColumn(), m_currentRow, labelRect ); } @@ -854,22 +1022,22 @@ bool wxDataViewMainWindow::RowPrepended() return false; } -bool wxDataViewMainWindow::RowInserted( size_t WXUNUSED(before) ) +bool wxDataViewMainWindow::RowInserted( unsigned int WXUNUSED(before) ) { return false; } -bool wxDataViewMainWindow::RowDeleted( size_t WXUNUSED(row) ) +bool wxDataViewMainWindow::RowDeleted( unsigned int WXUNUSED(row) ) { return false; } -bool wxDataViewMainWindow::RowChanged( size_t WXUNUSED(row) ) +bool wxDataViewMainWindow::RowChanged( unsigned int WXUNUSED(row) ) { return false; } -bool wxDataViewMainWindow::ValueChanged( size_t WXUNUSED(col), size_t row ) +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 ); @@ -878,10 +1046,10 @@ bool wxDataViewMainWindow::ValueChanged( size_t WXUNUSED(col), size_t row ) return true; } -bool wxDataViewMainWindow::RowsReordered( size_t *WXUNUSED(new_order) ) +bool wxDataViewMainWindow::RowsReordered( unsigned int *WXUNUSED(new_order) ) { Refresh(); - + return true; } @@ -916,8 +1084,8 @@ void wxDataViewMainWindow::RecalculateDisplay() } 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 ); @@ -940,7 +1108,10 @@ void wxDataViewMainWindow::ScrollWindow( int dx, int dy, const wxRect *rect ) void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) { - wxPaintDC dc( this ); + wxAutoBufferedPaintDC dc( this ); + + dc.SetBackground(GetBackgroundColour()); + dc.Clear(); GetOwner()->PrepareDC( dc ); @@ -951,22 +1122,62 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) wxDataViewListModel *model = GetOwner()->GetModel(); - size_t item_start = wxMax( 0, update.y / m_lineHeight ); - size_t item_count = wxMin( (update.height / m_lineHeight) + 1, - (int)(model->GetNumberOfRows()-item_start) ); + 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; - 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 ); - wxDataViewCell *cell = col->GetCell(); + wxDataViewRenderer *cell = col->GetRenderer(); cell_rect.width = col->GetWidth(); - size_t item; for (item = item_start; item < item_start+item_count; item++) { cell_rect.y = item*m_lineHeight; @@ -992,8 +1203,317 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) } } +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 ) { + 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 ); @@ -1001,8 +1521,8 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) wxDataViewColumn *col = NULL; int xpos = 0; - size_t cols = GetOwner()->GetNumberOfColumns(); - size_t i; + unsigned int cols = GetOwner()->GetNumberOfColumns(); + unsigned int i; for (i = 0; i < cols; i++) { wxDataViewColumn *c = GetOwner()->GetColumn( i ); @@ -1015,12 +1535,46 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) } if (!col) return; - wxDataViewCell *cell = col->GetCell(); + wxDataViewRenderer *cell = col->GetRenderer(); - size_t row = y / m_lineHeight; + 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(); @@ -1029,22 +1583,38 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) if (event.LeftDClick()) { - if (cell->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE) + if ( current == m_lineLastClicked ) { - 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 ); + 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; } + } - return; - } else 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) & (row == m_currentRow) && + if ((col == m_currentCol) && (current == m_currentRow) && (cell->GetMode() == wxDATAVIEW_CELL_EDITABLE) ) { m_renameTimer->Start( 100, true ); @@ -1052,26 +1622,130 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) } m_lastOnSame = false; - } else - if (event.LeftDown()) + 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; - size_t oldCurrentRow = m_currentRow; - + // Update selection here... m_currentCol = col; - m_currentRow = row; - - m_lastOnSame = (col == oldCurrentCol) && (row == oldCurrentRow); - - return; + + m_lastOnSame = !forceClick && ((col == oldCurrentCol) && (current == oldCurrentRow)) && oldWasSelected; } +} + +void wxDataViewMainWindow::OnSetFocus( wxFocusEvent &event ) +{ + m_hasFocus = true; + + if (HasCurrentRow()) + Refresh(); event.Skip(); } -void wxDataViewMainWindow::OnSetFocus( wxFocusEvent &event ) +void wxDataViewMainWindow::OnKillFocus( wxFocusEvent &event ) { + m_hasFocus = false; + + if (HasCurrentRow()) + Refresh(); + event.Skip(); } @@ -1110,7 +1784,11 @@ 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 SetTargetWindow( m_clientArea ); @@ -1179,9 +1857,49 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col ) return true; } +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 // wxUSE_DATAVIEWCTRL -