fix unused parameters warnings (#9529)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@54511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -15,15 +15,15 @@
|
|||||||
#include "wx/list.h"
|
#include "wx/list.h"
|
||||||
#include "wx/control.h"
|
#include "wx/control.h"
|
||||||
|
|
||||||
// ---------------------------------------------------------
|
// ---------------------------------------------------------
|
||||||
// classes
|
// classes
|
||||||
// ---------------------------------------------------------
|
// ---------------------------------------------------------
|
||||||
|
|
||||||
class WXDLLIMPEXP_CORE wxDataViewCtrl;
|
class WXDLLIMPEXP_CORE wxDataViewCtrl;
|
||||||
|
|
||||||
// ---------------------------------------------------------
|
// ---------------------------------------------------------
|
||||||
// wxDataViewRenderer
|
// wxDataViewRenderer
|
||||||
// ---------------------------------------------------------
|
// ---------------------------------------------------------
|
||||||
|
|
||||||
class wxDataViewRenderer: public wxDataViewRendererBase
|
class wxDataViewRenderer: public wxDataViewRendererBase
|
||||||
{
|
{
|
||||||
@@ -40,150 +40,150 @@ protected:
|
|||||||
protected:
|
protected:
|
||||||
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer)
|
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer)
|
||||||
};
|
};
|
||||||
|
|
||||||
// ---------------------------------------------------------
|
// ---------------------------------------------------------
|
||||||
// wxDataViewTextRenderer
|
// wxDataViewTextRenderer
|
||||||
// ---------------------------------------------------------
|
// ---------------------------------------------------------
|
||||||
|
|
||||||
class wxDataViewTextRenderer: public wxDataViewRenderer
|
class wxDataViewTextRenderer: public wxDataViewRenderer
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxDataViewTextRenderer( const wxString &varianttype = wxT("string"),
|
wxDataViewTextRenderer( const wxString &varianttype = wxT("string"),
|
||||||
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
|
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
|
||||||
|
|
||||||
bool SetValue( const wxVariant &value );
|
bool SetValue( const wxVariant &value );
|
||||||
bool GetValue( wxVariant &value );
|
bool GetValue( wxVariant &value );
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer)
|
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer)
|
||||||
};
|
};
|
||||||
|
|
||||||
// ---------------------------------------------------------
|
// ---------------------------------------------------------
|
||||||
// wxDataViewBitmapRenderer
|
// wxDataViewBitmapRenderer
|
||||||
// ---------------------------------------------------------
|
// ---------------------------------------------------------
|
||||||
|
|
||||||
class wxDataViewBitmapRenderer: public wxDataViewRenderer
|
class wxDataViewBitmapRenderer: public wxDataViewRenderer
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxDataViewBitmapRenderer( const wxString &varianttype = wxT("wxBitmap"),
|
wxDataViewBitmapRenderer( const wxString &varianttype = wxT("wxBitmap"),
|
||||||
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
|
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
|
||||||
|
|
||||||
bool SetValue( const wxVariant &value );
|
bool SetValue( const wxVariant &value );
|
||||||
bool GetValue( wxVariant &value );
|
bool GetValue( wxVariant &value );
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer)
|
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer)
|
||||||
};
|
};
|
||||||
|
|
||||||
// ---------------------------------------------------------
|
// ---------------------------------------------------------
|
||||||
// wxDataViewToggleRenderer
|
// wxDataViewToggleRenderer
|
||||||
// ---------------------------------------------------------
|
// ---------------------------------------------------------
|
||||||
|
|
||||||
class wxDataViewToggleRenderer: public wxDataViewRenderer
|
class wxDataViewToggleRenderer: public wxDataViewRenderer
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxDataViewToggleRenderer( const wxString &varianttype = wxT("bool"),
|
wxDataViewToggleRenderer( const wxString &varianttype = wxT("bool"),
|
||||||
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
|
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
|
||||||
|
|
||||||
bool SetValue( const wxVariant &value );
|
bool SetValue( const wxVariant &value );
|
||||||
bool GetValue( wxVariant &value );
|
bool GetValue( wxVariant &value );
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer)
|
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer)
|
||||||
};
|
};
|
||||||
|
|
||||||
// ---------------------------------------------------------
|
// ---------------------------------------------------------
|
||||||
// wxDataViewCustomRenderer
|
// wxDataViewCustomRenderer
|
||||||
// ---------------------------------------------------------
|
// ---------------------------------------------------------
|
||||||
|
|
||||||
class wxDataViewCustomRenderer: public wxDataViewRenderer
|
class wxDataViewCustomRenderer: public wxDataViewRenderer
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxDataViewCustomRenderer( const wxString &varianttype = wxT("string"),
|
wxDataViewCustomRenderer( const wxString &varianttype = wxT("string"),
|
||||||
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
|
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
|
||||||
bool no_init = false );
|
bool no_init = false );
|
||||||
virtual ~wxDataViewCustomRenderer();
|
virtual ~wxDataViewCustomRenderer();
|
||||||
bool Init();
|
bool Init();
|
||||||
|
|
||||||
virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0;
|
virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0;
|
||||||
virtual wxSize GetSize() = 0;
|
virtual wxSize GetSize() = 0;
|
||||||
|
|
||||||
virtual bool Activate( wxRect cell,
|
virtual bool Activate( wxRect cell,
|
||||||
wxDataViewListModel *model, unsigned int col, unsigned int row )
|
wxDataViewListModel * WXUNUSED(model), unsigned int WXUNUSED(col), unsigned int WXUNUSED(row) )
|
||||||
{ return false; }
|
{ return false; }
|
||||||
|
|
||||||
virtual bool LeftClick( wxPoint cursor, wxRect cell,
|
virtual bool LeftClick( wxPoint WXUNUSED(cursor), wxRect WXUNUSED(cell),
|
||||||
wxDataViewListModel *model, unsigned int col, unsigned int row )
|
wxDataViewListModel* WXUNUSED(model), unsigned int WXUNUSED(col), unsigned int WXUNUSED(row) )
|
||||||
{ return false; }
|
{ return false; }
|
||||||
virtual bool RightClick( wxPoint cursor, wxRect cell,
|
virtual bool RightClick( wxPoint WXUNUSED(cursor), wxRect WXUNUSED(cell),
|
||||||
wxDataViewListModel *model, unsigned int col, unsigned int row )
|
wxDataViewListModel* WXUNUSED(model), unsigned int WXUNUSED(col), unsigned int WXUNUSED(row) )
|
||||||
{ return false; }
|
{ return false; }
|
||||||
virtual bool StartDrag( wxPoint cursor, wxRect cell,
|
virtual bool StartDrag( wxPoint cursor, wxRect cell,
|
||||||
wxDataViewListModel *model, unsigned int col, unsigned int row )
|
wxDataViewListModel* WXUNUSED(model), unsigned int WXUNUSED(col), unsigned int WXUNUSED(row) )
|
||||||
{ return false; }
|
{ return false; }
|
||||||
|
|
||||||
// Create DC on request
|
// Create DC on request
|
||||||
virtual wxDC *GetDC();
|
virtual wxDC *GetDC();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
wxDC *m_dc;
|
wxDC *m_dc;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer)
|
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer)
|
||||||
};
|
};
|
||||||
|
|
||||||
// ---------------------------------------------------------
|
// ---------------------------------------------------------
|
||||||
// wxDataViewProgressRenderer
|
// wxDataViewProgressRenderer
|
||||||
// ---------------------------------------------------------
|
// ---------------------------------------------------------
|
||||||
|
|
||||||
class wxDataViewProgressRenderer: public wxDataViewCustomRenderer
|
class wxDataViewProgressRenderer: public wxDataViewCustomRenderer
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxDataViewProgressRenderer( const wxString &label = wxEmptyString,
|
wxDataViewProgressRenderer( const wxString &label = wxEmptyString,
|
||||||
const wxString &varianttype = wxT("long"),
|
const wxString &varianttype = wxT("long"),
|
||||||
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
|
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
|
||||||
virtual ~wxDataViewProgressRenderer();
|
virtual ~wxDataViewProgressRenderer();
|
||||||
|
|
||||||
bool SetValue( const wxVariant &value );
|
bool SetValue( const wxVariant &value );
|
||||||
|
|
||||||
virtual bool Render( wxRect cell, wxDC *dc, int state );
|
virtual bool Render( wxRect cell, wxDC *dc, int state );
|
||||||
virtual wxSize GetSize();
|
virtual wxSize GetSize();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
wxString m_label;
|
wxString m_label;
|
||||||
int m_value;
|
int m_value;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer)
|
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer)
|
||||||
};
|
};
|
||||||
|
|
||||||
// ---------------------------------------------------------
|
// ---------------------------------------------------------
|
||||||
// wxDataViewDateRenderer
|
// wxDataViewDateRenderer
|
||||||
// ---------------------------------------------------------
|
// ---------------------------------------------------------
|
||||||
|
|
||||||
class wxDataViewDateRenderer: public wxDataViewCustomRenderer
|
class wxDataViewDateRenderer: public wxDataViewCustomRenderer
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxDataViewDateRenderer( const wxString &varianttype = wxT("datetime"),
|
wxDataViewDateRenderer( const wxString &varianttype = wxT("datetime"),
|
||||||
wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE );
|
wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE );
|
||||||
|
|
||||||
bool SetValue( const wxVariant &value );
|
bool SetValue( const wxVariant &value );
|
||||||
|
|
||||||
virtual bool Render( wxRect cell, wxDC *dc, int state );
|
virtual bool Render( wxRect cell, wxDC *dc, int state );
|
||||||
virtual wxSize GetSize();
|
virtual wxSize GetSize();
|
||||||
virtual bool Activate( wxRect cell,
|
virtual bool Activate( wxRect cell,
|
||||||
wxDataViewListModel *model, unsigned int col, unsigned int row );
|
wxDataViewListModel *model, unsigned int col, unsigned int row );
|
||||||
|
|
||||||
private:
|
private:
|
||||||
wxDateTime m_date;
|
wxDateTime m_date;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateRenderer)
|
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateRenderer)
|
||||||
};
|
};
|
||||||
|
|
||||||
// ---------------------------------------------------------
|
// ---------------------------------------------------------
|
||||||
// wxDataViewColumn
|
// wxDataViewColumn
|
||||||
// ---------------------------------------------------------
|
// ---------------------------------------------------------
|
||||||
|
|
||||||
class WXDLLIMPEXP_CORE wxDataViewColumn: public wxDataViewColumnBase
|
class WXDLLIMPEXP_CORE wxDataViewColumn: public wxDataViewColumnBase
|
||||||
{
|
{
|
||||||
@@ -200,45 +200,45 @@ public:
|
|||||||
virtual void SetOwner( wxDataViewCtrl *owner );
|
virtual void SetOwner( wxDataViewCtrl *owner );
|
||||||
|
|
||||||
virtual void SetAlignment( wxAlignment align );
|
virtual void SetAlignment( wxAlignment align );
|
||||||
|
|
||||||
virtual void SetSortable( bool sortable );
|
virtual void SetSortable( bool sortable );
|
||||||
virtual bool GetSortable();
|
virtual bool GetSortable();
|
||||||
virtual void SetSortOrder( bool ascending );
|
virtual void SetSortOrder( bool ascending );
|
||||||
virtual bool IsSortOrderAscending();
|
virtual bool IsSortOrderAscending();
|
||||||
|
|
||||||
virtual int GetWidth();
|
virtual int GetWidth();
|
||||||
|
|
||||||
virtual void SetFixedWidth( int width );
|
virtual void SetFixedWidth( int width );
|
||||||
virtual int GetFixedWidth();
|
virtual int GetFixedWidth();
|
||||||
|
|
||||||
// implementation
|
// implementation
|
||||||
void* GetGtkHandle() { return m_column; }
|
void* GetGtkHandle() { return m_column; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
// holds the GTK handle
|
// holds the GTK handle
|
||||||
void* m_column;
|
void* m_column;
|
||||||
|
|
||||||
// delayed connection to mouse events
|
// delayed connection to mouse events
|
||||||
friend class wxDataViewCtrl;
|
friend class wxDataViewCtrl;
|
||||||
void OnInternalIdle();
|
void OnInternalIdle();
|
||||||
bool m_isConnected;
|
bool m_isConnected;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewColumn)
|
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewColumn)
|
||||||
};
|
};
|
||||||
|
|
||||||
// ---------------------------------------------------------
|
// ---------------------------------------------------------
|
||||||
// wxDataViewCtrl
|
// wxDataViewCtrl
|
||||||
// ---------------------------------------------------------
|
// ---------------------------------------------------------
|
||||||
|
|
||||||
class WXDLLIMPEXP_CORE wxDataViewCtrl: public wxDataViewCtrlBase
|
class WXDLLIMPEXP_CORE wxDataViewCtrl: public wxDataViewCtrlBase
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxDataViewCtrl()
|
wxDataViewCtrl()
|
||||||
{
|
{
|
||||||
Init();
|
Init();
|
||||||
}
|
}
|
||||||
|
|
||||||
wxDataViewCtrl( wxWindow *parent, wxWindowID id,
|
wxDataViewCtrl( wxWindow *parent, wxWindowID id,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
const wxSize& size = wxDefaultSize, long style = 0,
|
const wxSize& size = wxDefaultSize, long style = 0,
|
||||||
@@ -258,28 +258,28 @@ public:
|
|||||||
|
|
||||||
virtual bool AssociateModel( wxDataViewListModel *model );
|
virtual bool AssociateModel( wxDataViewListModel *model );
|
||||||
virtual bool AppendColumn( wxDataViewColumn *col );
|
virtual bool AppendColumn( wxDataViewColumn *col );
|
||||||
|
|
||||||
virtual void SetSelection( int row ); // -1 for unselect
|
virtual void SetSelection( int row ); // -1 for unselect
|
||||||
virtual void SetSelectionRange( unsigned int from, unsigned int to );
|
virtual void SetSelectionRange( unsigned int from, unsigned int to );
|
||||||
virtual void SetSelections( const wxArrayInt& aSelections);
|
virtual void SetSelections( const wxArrayInt& aSelections);
|
||||||
virtual void Unselect( unsigned int row );
|
virtual void Unselect( unsigned int row );
|
||||||
|
|
||||||
virtual bool IsSelected( unsigned int row ) const;
|
virtual bool IsSelected( unsigned int row ) const;
|
||||||
virtual int GetSelection() const;
|
virtual int GetSelection() const;
|
||||||
virtual int GetSelections(wxArrayInt& aSelections) const;
|
virtual int GetSelections(wxArrayInt& aSelections) const;
|
||||||
|
|
||||||
static wxVisualAttributes
|
static wxVisualAttributes
|
||||||
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
|
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
friend class wxDataViewCtrlDC;
|
friend class wxDataViewCtrlDC;
|
||||||
friend class wxDataViewColumn;
|
friend class wxDataViewColumn;
|
||||||
friend class wxGtkDataViewListModelNotifier;
|
friend class wxGtkDataViewListModelNotifier;
|
||||||
GtkWidget *m_treeview;
|
GtkWidget *m_treeview;
|
||||||
wxDataViewListModelNotifier *m_notifier;
|
wxDataViewListModelNotifier *m_notifier;
|
||||||
|
|
||||||
virtual void OnInternalIdle();
|
virtual void OnInternalIdle();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)
|
DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)
|
||||||
DECLARE_NO_COPY_CLASS(wxDataViewCtrl)
|
DECLARE_NO_COPY_CLASS(wxDataViewCtrl)
|
||||||
|
Reference in New Issue
Block a user