// classes
// ---------------------------------------------------------
-class WXDLLIMPEXP_CORE wxDataViewCtrl;
+class WXDLLIMPEXP_FWD_ADV wxDataViewCtrl;
+class WXDLLIMPEXP_FWD_ADV wxDataViewCtrlInternal;
// ---------------------------------------------------------
// wxDataViewRenderer
// ---------------------------------------------------------
-class wxDataViewRenderer: public wxDataViewRendererBase
+class WXDLLIMPEXP_ADV wxDataViewRenderer: public wxDataViewRendererBase
{
public:
wxDataViewRenderer( const wxString &varianttype,
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int align = wxDVR_DEFAULT_ALIGNMENT );
- // implementation
- GtkWidget* GetGtkHandle() { return m_renderer; }
-
virtual void SetMode( wxDataViewCellMode mode );
virtual wxDataViewCellMode GetMode() const;
virtual void SetAlignment( int align );
virtual int GetAlignment() const;
+ // implementation
+ GtkCellRenderer* GetGtkHandle() { return m_renderer; }
+ void GtkInitHandlers();
+ virtual bool GtkHasAttributes() { return false; }
+
protected:
- GtkWidget *m_renderer;
+ GtkCellRenderer *m_renderer;
protected:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer)
// wxDataViewTextRenderer
// ---------------------------------------------------------
-class wxDataViewTextRenderer: public wxDataViewRenderer
+class WXDLLIMPEXP_ADV wxDataViewTextRenderer: public wxDataViewRenderer
{
public:
wxDataViewTextRenderer( const wxString &varianttype = wxT("string"),
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer)
};
+// ---------------------------------------------------------
+// wxDataViewTextRendererAttr
+// ---------------------------------------------------------
+
+class WXDLLIMPEXP_ADV wxDataViewTextRendererAttr: public wxDataViewTextRenderer
+{
+public:
+ wxDataViewTextRendererAttr( const wxString &varianttype = wxT("string"),
+ wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
+ int align = wxDVR_DEFAULT_ALIGNMENT );
+
+ // implementation
+ bool GtkHasAttributes() { return true; }
+
+protected:
+ DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRendererAttr)
+};
+
// ---------------------------------------------------------
// wxDataViewBitmapRenderer
// ---------------------------------------------------------
-class wxDataViewBitmapRenderer: public wxDataViewRenderer
+class WXDLLIMPEXP_ADV wxDataViewBitmapRenderer: public wxDataViewRenderer
{
public:
wxDataViewBitmapRenderer( const wxString &varianttype = wxT("wxBitmap"),
// wxDataViewToggleRenderer
// ---------------------------------------------------------
-class wxDataViewToggleRenderer: public wxDataViewRenderer
+class WXDLLIMPEXP_ADV wxDataViewToggleRenderer: public wxDataViewRenderer
{
public:
wxDataViewToggleRenderer( const wxString &varianttype = wxT("bool"),
// wxDataViewCustomRenderer
// ---------------------------------------------------------
-class wxDataViewCustomRenderer: public wxDataViewRenderer
+class WXDLLIMPEXP_ADV wxDataViewCustomRenderer: public wxDataViewRenderer
{
public:
wxDataViewCustomRenderer( const wxString &varianttype = wxT("string"),
virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0;
+
+ void RenderText( const wxString &text, int xoffset, wxRect cell, wxDC *dc, int state );
+
virtual wxSize GetSize() const = 0;
- virtual bool Activate( wxRect cell,
- wxDataViewListModel *model, unsigned int col, unsigned int row )
+ virtual bool Activate( wxRect WXUNUSED(cell),
+ wxDataViewModel *WXUNUSED(model), const wxDataViewItem &WXUNUSED(item), unsigned int WXUNUSED(col) )
{ return false; }
- virtual bool LeftClick( wxPoint cursor, wxRect cell,
- wxDataViewListModel *model, unsigned int col, unsigned int row )
+ 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 cursor, wxRect cell,
- wxDataViewListModel *model, unsigned int col, unsigned int row )
+ 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 cursor, wxRect cell,
- wxDataViewListModel *model, unsigned int col, unsigned int row )
+ virtual bool StartDrag( wxPoint WXUNUSED(cursor), wxRect WXUNUSED(cell),
+ wxDataViewModel *WXUNUSED(model), const wxDataViewItem &WXUNUSED(item), unsigned int WXUNUSED(col) )
{ return false; }
// Create DC on request
private:
wxDC *m_dc;
-
+
+public:
+ // Internal, temporay for RenderText.
+ GtkCellRenderer *m_text_renderer;
+ GdkWindow *window;
+ GtkWidget *widget;
+ void *background_area;
+ void *cell_area;
+ void *expose_area;
+ int flags;
+
protected:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer)
};
// wxDataViewProgressRenderer
// ---------------------------------------------------------
-class wxDataViewProgressRenderer: public wxDataViewCustomRenderer
+class WXDLLIMPEXP_ADV wxDataViewProgressRenderer: public wxDataViewCustomRenderer
{
public:
wxDataViewProgressRenderer( const wxString &label = wxEmptyString,
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer)
};
+// ---------------------------------------------------------
+// wxDataViewIconTextRenderer
+// ---------------------------------------------------------
+
+class WXDLLIMPEXP_ADV wxDataViewIconTextRenderer: public wxDataViewCustomRenderer
+{
+public:
+ wxDataViewIconTextRenderer( const wxString &varianttype = wxT("wxDataViewIconText"),
+ wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
+ int align = wxDVR_DEFAULT_ALIGNMENT );
+ virtual ~wxDataViewIconTextRenderer();
+
+ bool SetValue( const wxVariant &value );
+ bool GetValue( wxVariant &value ) const;
+
+ virtual bool Render( wxRect cell, wxDC *dc, int state );
+ virtual wxSize GetSize() const;
+
+ virtual bool HasEditorCtrl() { return true; }
+ virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value );
+ virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value );
+
+private:
+ wxDataViewIconText m_value;
+
+protected:
+ DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer)
+};
+
// ---------------------------------------------------------
// wxDataViewDateRenderer
// ---------------------------------------------------------
-class wxDataViewDateRenderer: public wxDataViewCustomRenderer
+class WXDLLIMPEXP_ADV wxDataViewDateRenderer: public wxDataViewCustomRenderer
{
public:
wxDataViewDateRenderer( const wxString &varianttype = wxT("datetime"),
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;
// wxDataViewColumn
// ---------------------------------------------------------
-class WXDLLIMPEXP_CORE wxDataViewColumn: public wxDataViewColumnBase
+class WXDLLIMPEXP_ADV wxDataViewColumn: public wxDataViewColumnBase
{
public:
wxDataViewColumn( const wxString &title, wxDataViewRenderer *renderer,
// implementation
GtkWidget* GetGtkHandle() { return m_column; }
+ GtkWidget* GetConstGtkHandle() const { return m_column; }
private:
// holds the GTK handle
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewColumn)
};
+WX_DECLARE_LIST_WITH_DECL(wxDataViewColumn, wxDataViewColumnList,
+ class WXDLLIMPEXP_ADV);
+
// ---------------------------------------------------------
// wxDataViewCtrl
// ---------------------------------------------------------
-class WXDLLIMPEXP_CORE wxDataViewCtrl: public wxDataViewCtrlBase
+class WXDLLIMPEXP_ADV wxDataViewCtrl: public wxDataViewCtrlBase
{
public:
wxDataViewCtrl()
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator );
- virtual bool AssociateModel( wxDataViewListModel *model );
- virtual bool AppendColumn( wxDataViewColumn *col );
+ virtual bool AssociateModel( wxDataViewModel *model );
- virtual void SetSelection( int row ); // -1 for unselect
- virtual void SetSelectionRange( unsigned int from, unsigned int to );
- virtual void SetSelections( const wxArrayInt& aSelections);
- virtual void Unselect( unsigned int row );
-
- virtual bool IsSelected( unsigned int row ) const;
- virtual int GetSelection() const;
- virtual int GetSelections(wxArrayInt& aSelections) const;
+ virtual bool PrependColumn( wxDataViewColumn *col );
+ virtual bool AppendColumn( wxDataViewColumn *col );
+ virtual unsigned int GetColumnCount() const;
+ virtual wxDataViewColumn* GetColumn( unsigned int pos ) const;
+ virtual bool DeleteColumn( wxDataViewColumn *column );
+ virtual bool ClearColumns();
+ virtual int GetColumnPosition( const wxDataViewColumn *column ) const;
+
+ virtual wxDataViewColumn *GetSortingColumn() const;
+
+ virtual wxDataViewItem GetSelection() const;
+ virtual int GetSelections( wxDataViewItemArray & sel ) const;
+ virtual void SetSelections( const wxDataViewItemArray & sel );
+ virtual void Select( const wxDataViewItem & item );
+ virtual void Unselect( const wxDataViewItem & item );
+ virtual bool IsSelected( const wxDataViewItem & item ) const;
+ virtual void SelectAll();
+ virtual void UnselectAll();
+
+ virtual void EnsureVisible( const wxDataViewItem& item,
+ const wxDataViewColumn *column = NULL );
+ virtual void HitTest( const wxPoint &point,
+ wxDataViewItem &item,
+ wxDataViewColumn *&column ) const;
+ virtual wxRect GetItemRect( const wxDataViewItem &item,
+ const wxDataViewColumn *column = NULL ) const;
+
+ virtual void Expand( const wxDataViewItem & item );
+ virtual void Collapse( const wxDataViewItem & item );
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
- GtkWidget *GtkGetTreeView() { return m_treeview; }
wxWindow *GetMainWindow() { return (wxWindow*) this; }
+ GtkWidget *GtkGetTreeView() { return m_treeview; }
+ wxDataViewCtrlInternal* GtkGetInternal() { return m_internal; }
+
+protected:
+ virtual void DoSetExpanderColumn();
+ virtual void DoSetIndent();
+
private:
- friend class wxDataViewCtrlDC;
+ friend class wxDataViewCtrlDCImpl;
friend class wxDataViewColumn;
- friend class wxGtkDataViewListModelNotifier;
- GtkWidget *m_treeview;
- wxDataViewListModelNotifier *m_notifier;
+ friend class wxGtkDataViewModelNotifier;
+ GtkWidget *m_treeview;
+ wxDataViewModelNotifier *m_notifier;
+ wxDataViewCtrlInternal *m_internal;
+ wxDataViewColumnList m_cols;
+
virtual void OnInternalIdle();
+ void GtkEnableSelectionEvents();
+ void GtkDisableSelectionEvents();
+
private:
DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)
DECLARE_NO_COPY_CLASS(wxDataViewCtrl)