Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bo'd patch to make wxDataViewCtrl compile again (4th attempt

Browse Source 
to actually commit).



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2007-07-09 10:38:22 +00:00
parent c185173ef0
commit aba9bfd00a
4 changed files with 339 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
include/wx/generic/dataview.h
View File

@@ -51,28 +51,28 @@ public:
{ return m_mode; }
virtual bool Activate( wxRect WXUNUSED(cell),
wxDataViewListModel *WXUNUSED(model),
unsigned int WXUNUSED(col),
unsigned int WXUNUSED(row) )
wxDataViewModel *WXUNUSED(model),
const wxDataViewItem & item,
unsigned int WXUNUSED(col) )
{ return false; }
virtual bool LeftClick( wxPoint WXUNUSED(cursor),
wxRect WXUNUSED(cell),
wxDataViewListModel *WXUNUSED(model),
unsigned int WXUNUSED(col),
unsigned int WXUNUSED(row) )
wxDataViewModel *WXUNUSED(model),
const wxDataViewItem & item,
unsigned int WXUNUSED(col) )
{ return false; }
virtual bool RightClick( wxPoint WXUNUSED(cursor),
wxRect WXUNUSED(cell),
wxDataViewListModel *WXUNUSED(model),
unsigned int WXUNUSED(col),
unsigned int WXUNUSED(row) )
wxDataViewModel *WXUNUSED(model),
const wxDataViewItem & item,
unsigned int WXUNUSED(col) )
{ return false; }
virtual bool StartDrag( wxPoint WXUNUSED(cursor),
wxRect WXUNUSED(cell),
wxDataViewListModel *WXUNUSED(model),
unsigned int WXUNUSED(col),
unsigned int WXUNUSED(row) )
wxDataViewModel *WXUNUSED(model),
const wxDataViewItem & item,
unsigned int WXUNUSED(col) )
{ return false; }
// Create DC on request
@@ -172,8 +172,8 @@ public:
bool GetValue( wxVariant &value ) const;
bool Render( wxRect cell, wxDC *dc, int state );
bool Activate( wxRect cell, wxDataViewListModel *model, unsigned int col,
unsigned int row );
bool Activate( wxRect cell, wxDataViewModel *model, const wxDataViewItem & item,
unsigned int col );
wxSize GetSize() const;
private:
@@ -227,7 +227,7 @@ public:
virtual bool Render( wxRect cell, wxDC *dc, int state );
virtual wxSize GetSize() const;
virtual bool Activate( wxRect cell,
wxDataViewListModel *model, unsigned int col, unsigned int row );
wxDataViewModel *model, const wxDataViewItem & item, unsigned int col );
private:
wxDateTime m_date;
@@ -346,9 +346,10 @@ public:
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator );
virtual bool AssociateModel( wxDataViewListModel *model );
virtual bool AssociateModel( wxDataViewModel *model );
virtual bool AppendColumn( wxDataViewColumn *col );
/********************selection code*********************
virtual void SetSelection( int row ); // -1 for unselect
virtual void SetSelectionRange( unsigned int from, unsigned int to );
virtual void SetSelections( const wxArrayInt& aSelections);
@@ -357,6 +358,7 @@ public:
virtual bool IsSelected( unsigned int row ) const;
virtual int GetSelection() const;
virtual int GetSelections(wxArrayInt& aSelections) const;
*****************************************************/
public: // utility functions not part of the API
@@ -372,7 +374,7 @@ public: // utility functions not part of the API
wxWindow *GetMainWindow() { return (wxWindow*) m_clientArea; }
private:
wxDataViewListModelNotifier *m_notifier;
wxDataViewModelNotifier *m_notifier;
wxDataViewMainWindow *m_clientArea;
wxDataViewHeaderWindow *m_headerArea;