put grid string in generic/grid.cpp, not common/datacmn.cpp

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

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index f9ef2529fd892a83d7b944f75082c3bc1a734b9b..947e81690fcb2caaac7e59d6f184c4c335838d69 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -168,7 +168,7 @@ public:
     // set value, call ValueChanged() afterwards!
     virtual bool SetValue( wxVariant &variant, size_t col, size_t row );
 
-    // delegated notifiers
+    // called from user
     virtual bool RowAppended();
     virtual bool RowPrepended();
     virtual bool RowInserted( size_t before );
@@ -178,7 +178,15 @@ public:
     virtual bool RowsReordered( size_t *new_order );
     virtual bool Cleared();
 
+    // called if child's notifiers are called
+    bool ChildRowAppended();
+    bool ChildRowPrepended();
+    bool ChildRowInserted( size_t before );
+    bool ChildRowDeleted( size_t row );
+    bool ChildRowChanged( size_t row );
     bool ChildValueChanged( size_t col, size_t row );
+    bool ChildRowsReordered( size_t *new_order );
+    bool ChildCleared();
 
     virtual void Resort();
 
@@ -245,19 +253,12 @@ enum wxDataViewColumnFlags
     wxDATAVIEW_COL_HIDDEN     = 4
 };
 
-enum wxDataViewColumnSizing
-{
-    wxDATAVIEW_COL_WIDTH_FIXED,
-    wxDATAVIEW_COL_WIDTH_AUTO,
-    wxDATAVIEW_COL_WIDTH_GROW
-};
-
 class WXDLLIMPEXP_ADV wxDataViewColumnBase: public wxObject
 {
 public:
     wxDataViewColumnBase( const wxString &title, wxDataViewCell *cell, size_t model_column,
-        int fixed_width = 80, wxDataViewColumnSizing sizing = wxDATAVIEW_COL_WIDTH_FIXED, int flags = 0 );
-    ~wxDataViewColumnBase();
+        int width = 80, int flags = wxDATAVIEW_COL_RESIZABLE );
+    virtual ~wxDataViewColumnBase();
 
     virtual void SetTitle( const wxString &title );
     virtual wxString GetTitle();
@@ -271,9 +272,6 @@ public:
 
     virtual int GetWidth() = 0;
 
-    virtual void SetFixedWidth( int width ) = 0;
-    virtual int GetFixedWidth() = 0;
-
 private:
     wxDataViewCtrl          *m_ctrl;
     wxDataViewCell          *m_cell;
@@ -297,7 +295,7 @@ class WXDLLIMPEXP_ADV wxDataViewCtrlBase: public wxControl
 {
 public:
     wxDataViewCtrlBase();
-    ~wxDataViewCtrlBase();
+    virtual ~wxDataViewCtrlBase();
 
     virtual bool AssociateModel( wxDataViewListModel *model );
     wxDataViewListModel* GetModel();