Revert the strict aliasing "fix". As per Michael Wetherell it isn't correct as we...

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

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 0b2ae8d09f90a158c44f416f3b6fe1cb36675727..47c7b9ad1062cd38b499626c9a49c5ddff1e8c51 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -136,13 +136,11 @@ public:
     virtual bool BeginEdit()    { return true; }
     virtual bool EndEdit()      { return true; }
     
     virtual bool BeginEdit()    { return true; }
     virtual bool EndEdit()      { return true; }
     

-    virtual bool Render( wxRect cell, wxRect exposed, wxDC *dc, int state ) { return true; }
+    wxString GetVariantType()   { return m_variantType; }

     
     void SetOwner( wxDataViewColumn *owner )    { m_owner = owner; }
     wxDataViewColumn* GetOwner()                { return m_owner; }
     
     
     void SetOwner( wxDataViewColumn *owner )    { m_owner = owner; }
     wxDataViewColumn* GetOwner()                { return m_owner; }
     

-    wxString GetVariantType()   { return m_variantType; }
-    

 protected:
     wxDataViewCellMode      m_mode;
     wxString                m_variantType;
 protected:
     wxDataViewCellMode      m_mode;
     wxString                m_variantType;


@@ -204,7 +202,9 @@ public:
     virtual bool AssociateModel( wxDataViewListModel *model );
     wxDataViewListModel* GetModel();
     
     virtual bool AssociateModel( wxDataViewListModel *model );
     wxDataViewListModel* GetModel();
     

-    virtual bool AppendStringColumn( const wxString &label, size_t model_column );
+    virtual bool AppendTextColumn( const wxString &label, size_t model_column );
+    virtual bool AppendToggleColumn( const wxString &label, size_t model_column );
+    virtual bool AppendProgressColumn( const wxString &label, size_t model_column );

     virtual bool AppendColumn( wxDataViewColumn *col );    
     virtual size_t GetNumberOfColumns();
     virtual bool DeleteColumn( size_t pos );
     virtual bool AppendColumn( wxDataViewColumn *col );    
     virtual size_t GetNumberOfColumns();
     virtual bool DeleteColumn( size_t pos );