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

Make some wxDataViewCustomRenderer virtuals consistent across platforms.

Browse Source 
Add missing WXDLLIMPEXP_ADV.
Add missing impl for wxDataViewEvent::GetPosition

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2008-03-17 21:00:06 +00:00
parent 069b2e5941
commit 5cfb6fee91
4 changed files with 43 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/dataview.h
View File

@@ -725,7 +725,7 @@ public:
wxDataViewColumn *GetDataViewColumn() const { return m_column; }
// for wxEVT_DATAVIEW_CONTEXT_MENU only
wxPoint GetPosition() const;
wxPoint GetPosition() const { return m_pos; }
void SetPosition( int x, int y ) { m_pos.x = x; m_pos.y = y; }
virtual wxEvent *Clone() const { return new wxDataViewEvent(*this); }

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

@@ -243,7 +243,7 @@ protected:
// wxDataViewIconTextRenderer
// ---------------------------------------------------------
class wxDataViewIconTextRenderer: public wxDataViewCustomRenderer
class WXDLLIMPEXP_ADV wxDataViewIconTextRenderer: public wxDataViewCustomRenderer
{
public:
wxDataViewIconTextRenderer( const wxString &varianttype = wxT("wxDataViewIconText"),

39
include/wx/mac/carbon/dataview.h
View File

@@ -123,25 +123,32 @@ public:
//
virtual bool Render(wxRect cell, wxDC* dc, int state) = 0;
virtual bool Activate(wxRect WXUNUSED(cell), wxDataViewModel *WXUNUSED(model), unsigned int WXUNUSED(col), unsigned int WXUNUSED(row))
{
return false;
}
virtual bool Activate( wxRect WXUNUSED(cell),
wxDataViewModel *WXUNUSED(model),
const wxDataViewItem & WXUNUSED(item),
unsigned int WXUNUSED(col) )
{ return false; }
virtual bool LeftClick(wxPoint WXUNUSED(cursor), wxRect WXUNUSED(cell), wxDataViewModel *WXUNUSED(model), unsigned int WXUNUSED(col), unsigned int WXUNUSED(row))
{
return false;
}
virtual bool LeftClick( wxPoint WXUNUSED(cursor),
wxRect WXUNUSED(cell),
wxDataViewModel *WXUNUSED(model),
const wxDataViewItem & WXUNUSED(item),
unsigned int WXUNUSED(col) )
{ return false; }
virtual bool RightClick(wxPoint WXUNUSED(cursor), wxRect WXUNUSED(cell), wxDataViewModel *WXUNUSED(model), unsigned int WXUNUSED(col), unsigned int WXUNUSED(row))
{
return false;
}
virtual bool RightClick( wxPoint WXUNUSED(cursor),
wxRect WXUNUSED(cell),
wxDataViewModel *WXUNUSED(model),
const wxDataViewItem & WXUNUSED(item),
unsigned int WXUNUSED(col) )
{ return false; }
virtual bool StartDrag(wxPoint WXUNUSED(cursor), wxRect WXUNUSED(cell), wxDataViewModel *WXUNUSED(model), unsigned int WXUNUSED(col), unsigned int WXUNUSED(row))
{
return false;
}
virtual bool StartDrag( wxPoint WXUNUSED(cursor),
wxRect WXUNUSED(cell),
wxDataViewModel *WXUNUSED(model),
const wxDataViewItem & WXUNUSED(item),
unsigned int WXUNUSED(col) )
{ return false; }
//
// device context handling

25
interface/dataview.h
View File

@@ -582,9 +582,10 @@ public:
/**
Override this to react to double clicks or ENTER.
*/
virtual bool Activate(wxRect cell, wxDataViewModel* model,
unsigned int col,
unsigned int row);
virtual bool Activate( wxRect cell,
wxDataViewModel* model,
const wxDataViewItem & item,
unsigned int col );
/**
Override this to create the actual editor control once editing
@@ -622,10 +623,11 @@ public:
/**
Overrride this to react to a left click.
*/
virtual bool LeftClick(wxPoint cursor, wxRect cell,
virtual bool LeftClick( wxPoint cursor,
wxRect cell,
wxDataViewModel * model,
unsigned int col,
unsigned int row);
const wxDataViewItem & item,
unsigned int col );
/**
Override this to render the cell. Before this is called,
@@ -646,18 +648,19 @@ public:
/**
Overrride this to react to a right click.
*/
virtual bool RightClick(wxPoint cursor, wxRect cell,
virtual bool RightClick(wxPoint cursor,
wxRect cell,
wxDataViewModel* model,
unsigned int col,
unsigned int row);
const wxDataViewItem & item,
unsigned int col);
/**
Overrride this to start a drag operation.
*/
virtual bool StartDrag(wxPoint cursor, wxRect cell,
wxDataViewModel* model,
unsigned int col,
unsigned int row);
const wxDataViewItem & item,
unsigned int col);
};