fixing warning and compile error against 10.4

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

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index cf597a881befd89994a6e7716b1e01179bed8f35..46b5e997abc1c7b7f18c0b3cff7fd08c04322628 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -172,6 +172,9 @@ public:
 
     bool IsDefault() const { return !(HasColour() || HasFont()); }
 
 
     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;
 private:
     wxColour m_colour;
     bool     m_bold;


@@ -231,6 +234,13 @@ public:
         return false;
     }
 
         return false;
     }
 

+    // Override this if you want to disable specific items
+    virtual bool IsEnabled(const wxDataViewItem &WXUNUSED(item),
+                           unsigned int WXUNUSED(col)) const
+    {
+        return true;
+    }
+

     // define hierachy
     virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const = 0;
     virtual bool IsContainer( const wxDataViewItem &item ) const = 0;
     // define hierachy
     virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const = 0;
     virtual bool IsContainer( const wxDataViewItem &item ) const = 0;


@@ -301,6 +311,12 @@ public:
         return false;
     }
 
         return false;
     }
 

+    virtual bool IsEnabledByRow(unsigned int WXUNUSED(row),
+                                unsigned int WXUNUSED(col)) const
+    {
+        return true;
+    }
+

 
     // helper methods provided by list models only
     virtual unsigned GetRow( const wxDataViewItem &item ) const = 0;
 
     // helper methods provided by list models only
     virtual unsigned GetRow( const wxDataViewItem &item ) const = 0;


@@ -341,6 +357,11 @@ public:
         return GetAttrByRow( GetRow(item), col, attr );
     }
 
         return GetAttrByRow( GetRow(item), col, attr );
     }
 

+    virtual bool IsEnabled(const wxDataViewItem &item, unsigned int col) const
+    {
+        return IsEnabledByRow( GetRow(item), col );
+    }
+

 
     virtual bool IsListModel() const { return true; }
 };
 
     virtual bool IsListModel() const { return true; }
 };