allow setting empty tooltip in SetIcon() (patch 1750994)

[wxWidgets.git] / include / wx / dataview.h

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 0a6a5a8f5480565946a0f2ee47d4791caf382097..71d4b24101ee5f9b1c3388a1675dbe3b08667e3f 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -83,7 +83,7 @@ private:
     wxUint32 m_id;
 };
 
     wxUint32 m_id;
 };
 

-bool operator == ( const wxDataViewItem& left, const wxDataViewItem& right );
+bool operator == (const wxDataViewItem &left, const wxDataViewItem &right);

 
 // ---------------------------------------------------------
 // wxDataViewModel
 
 // ---------------------------------------------------------
 // wxDataViewModel


@@ -112,11 +112,8 @@ public:
 
     // define hierachy
     virtual bool HasChildren( const wxDataViewItem &item ) const = 0;
 
     // define hierachy
     virtual bool HasChildren( const wxDataViewItem &item ) const = 0;

-    virtual int GetChildCount( const wxDataViewItem &item ) const = 0;
-    virtual wxDataViewItem GetParent( const wxDataViewItem &child ) const = 0;

     virtual wxDataViewItem GetFirstChild( const wxDataViewItem &parent ) const = 0;
     virtual wxDataViewItem GetNextSibling( const wxDataViewItem &item ) const = 0;
     virtual wxDataViewItem GetFirstChild( const wxDataViewItem &parent ) const = 0;
     virtual wxDataViewItem GetNextSibling( const wxDataViewItem &item ) const = 0;

-    virtual wxDataViewItem GetNthChild(  const wxDataViewItem &parent, unsigned int n ) const = 0;

 
     // delegated notifiers
     virtual bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );
 
     // delegated notifiers
     virtual bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );


@@ -410,13 +407,30 @@ public:
     virtual bool ClearColumns();
     virtual wxDataViewColumn* GetColumn( unsigned int pos );
 
     virtual bool ClearColumns();
     virtual wxDataViewColumn* GetColumn( unsigned int pos );
 

+    void SetExpanderColumn( unsigned int col )
+        { m_expander_column = col ; DoSetExpanderColumn(); }
+    unsigned int GetExpanderColumn() const 
+        { return m_expander_column; }
+
+    void SetIndent( int indent )
+        { m_indent = indent ; DoSetIndent(); }
+    int GetIndent() const 
+        { return m_indent; } 
+

     // TODO selection code
     // TODO selection code

+    virtual wxDataViewItem GetSelection() = 0;
+
+protected:
+    virtual void DoSetExpanderColumn() = 0 ;
+    virtual void DoSetIndent() = 0;

 
 private:
     wxDataViewModel        *m_model;
     wxList                  m_cols;
     wxDataViewEventModelNotifier *m_eventNotifier;
 
 private:
     wxDataViewModel        *m_model;
     wxList                  m_cols;
     wxDataViewEventModelNotifier *m_eventNotifier;

-    
+    unsigned int m_expander_column;
+    int m_indent ;
+       

 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCtrlBase)
 };
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCtrlBase)
 };