Disconnect "hide" menu signal to fix menu destruction in wxGTK.

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

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 0daadfc7ed90a9518979d99bc44bcb126c5e7efc..8950f405671fd50910c5bf52f4949431c2f278f8 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -125,7 +125,7 @@ public:
     virtual bool ItemsChanged( const wxDataViewItemArray &items );
     virtual bool ValueChanged( const wxDataViewItem &item, unsigned int col ) = 0;
     virtual bool Cleared() = 0;
-    
+
     // some platforms, such as GTK+, may need a two step procedure for ::Reset()
     virtual bool BeforeReset() { return true; }
     virtual bool AfterReset() { return Cleared(); }
@@ -172,6 +172,9 @@ public:
 
     bool IsDefault() const { return !(HasColour() || HasFont()); }
 
+    // Return the font based on the given one with this attribute applied to it.
+    wxFont GetEffectiveFont(const wxFont& font) const;
+
 private:
     wxColour m_colour;
     bool     m_bold;
@@ -305,6 +308,8 @@ public:
     // helper methods provided by list models only
     virtual unsigned GetRow( const wxDataViewItem &item ) const = 0;
 
+    // returns the number of rows
+    virtual unsigned int GetCount() const = 0;
 
     // implement some base class pure virtual directly
     virtual wxDataViewItem
@@ -339,6 +344,7 @@ public:
         return GetAttrByRow( GetRow(item), col, attr );
     }
 
+
     virtual bool IsListModel() const { return true; }
 };
 
@@ -1148,7 +1154,7 @@ public:
 
     wxDataViewItem GetNthChild( const wxDataViewItem& parent, unsigned int pos ) const;
     int GetChildCount( const wxDataViewItem& parent ) const;
-    
+
     void SetItemText( const wxDataViewItem& item, const wxString &text );
     wxString GetItemText( const wxDataViewItem& item ) const;
     void SetItemIcon( const wxDataViewItem& item, const wxIcon &icon );