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 fcb1dd20e40b9004891f1b8a6bdb9666f0b1c599..47c7b9ad1062cd38b499626c9a49c5ddff1e8c51 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -31,6 +31,7 @@
 
 class WXDLLIMPEXP_CORE wxDataViewCtrl;
 class WXDLLIMPEXP_CORE wxDataViewColumn;
+class WXDLLIMPEXP_CORE wxDataViewCell;
 
 extern WXDLLEXPORT_DATA(const wxChar) wxDataViewCtrlNameStr[];
 
@@ -79,9 +80,12 @@ public:
 
     virtual size_t GetNumberOfRows() = 0;
     virtual size_t GetNumberOfCols() = 0;
-    // as reported by wxVariant
+    // return type as reported by wxVariant
     virtual wxString GetColType( size_t col ) = 0;
+    // get value into a wxVariant
     virtual wxVariant GetValue( size_t col, size_t row ) = 0;
+    // set value, call ValueChanged() afterwards!
+    virtual bool SetValue( wxVariant &variant, size_t col, size_t row ) = 0;
 
     // delegated notifiers
     bool RowAppended();
@@ -89,7 +93,7 @@ public:
     bool RowInserted( size_t before );
     bool RowDeleted( size_t row );
     bool RowChanged( size_t row );
-    bool ValueChanged( size_t row, size_t col );
+    bool ValueChanged( size_t col, size_t row );
     bool Cleared();
     
     void SetNotifier( wxDataViewListModelNotifier *notifier );
@@ -103,21 +107,53 @@ protected:
 };
 
 // --------------------------------------------------------- 
-// wxDataViewColumn
+// wxDataViewCellBase
 // --------------------------------------------------------- 
 
-enum wxDataViewColumnType
+enum wxDataViewCellMode
 {
-    wxDATAVIEW_COL_TEXT,
-    wxDATAVIEW_COL_ICON,
-    wxDATAVIEW_COL_ICONTEXT,
-    wxDATAVIEW_COL_CHECK,
-    wxDATAVIEW_COL_DATETIME,
-    wxDATAVIEW_COL_PROGRESS,
-    wxDATAVIEW_COL_CHOICE,
-    wxDATAVIEW_COL_CUSTOM
+    wxDATAVIEW_CELL_INERT,
+    wxDATAVIEW_CELL_ACTIVATABLE,
+    wxDATAVIEW_CELL_EDITABLE
 };
 
+enum wxDataViewCellRenderState
+{
+    wxDATAVIEW_CELL_SELECTED    = 1,
+    wxDATAVIEW_CELL_PRELIT      = 2,
+    wxDATAVIEW_CELL_INSENSITIVE = 4,
+    wxDATAVIEW_CELL_FOCUSED     = 8
+};
+
+class wxDataViewCellBase: public wxObject
+{
+public:
+    wxDataViewCellBase( const wxString &varianttype, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
+
+    virtual bool SetValue( const wxVariant &value ) { return true; }
+    virtual bool GetValue( wxVariant &value )       { return true; }
+    virtual bool Validate( wxVariant &value )       { return true; }
+    virtual bool BeginEdit()    { return true; }
+    virtual bool EndEdit()      { return true; }
+    
+    wxString GetVariantType()   { return m_variantType; }
+    
+    void SetOwner( wxDataViewColumn *owner )    { m_owner = owner; }
+    wxDataViewColumn* GetOwner()                { return m_owner; }
+    
+protected:
+    wxDataViewCellMode      m_mode;
+    wxString                m_variantType;
+    wxDataViewColumn       *m_owner;
+
+protected:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCellBase)
+};
+
+// --------------------------------------------------------- 
+// wxDataViewColumnBase
+// --------------------------------------------------------- 
+
 enum wxDataViewColumnFlags
 {
     wxDATAVIEW_COL_RESIZABLE  = 1,
@@ -128,17 +164,26 @@ enum wxDataViewColumnFlags
 class wxDataViewColumnBase: public wxObject
 {
 public:
-    wxDataViewColumnBase( const wxString &title, wxDataViewCtrl *ctrl, 
-            wxDataViewColumnType kind, int flags = 0 );
+    wxDataViewColumnBase( const wxString &title, wxDataViewCell *cell, size_t model_column, int flags = 0 );
+    ~wxDataViewColumnBase();
 
     virtual void SetTitle( const wxString &title );
     virtual wxString GetTitle();
+    
+    wxDataViewCell* GetCell()               { return m_cell; }
+    
+    size_t GetModelColumn()                 { return m_model_column; }
+    
+    void SetOwner( wxDataViewCtrl *owner )  { m_owner = owner; }
+    wxDataViewCtrl *GetOwner()              { return m_owner; }
 
 private:
     wxDataViewCtrl          *m_ctrl;
-    wxDataViewColumnType     m_kind;
+    wxDataViewCell          *m_cell;
+    int                      m_model_column;
     int                      m_flags;
     wxString                 m_title;
+    wxDataViewCtrl          *m_owner;
 
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewColumnBase)
@@ -153,12 +198,13 @@ class wxDataViewCtrlBase: public wxControl
 public:
     wxDataViewCtrlBase();
     ~wxDataViewCtrlBase();
-
     
     virtual bool AssociateModel( wxDataViewListModel *model );
     wxDataViewListModel* GetModel();
     
-    virtual bool AppendStringColumn( const wxString &label );
+    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 );