X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f850e28314ba5c1a020b3853b71f3e8520b04fe..fbb7ee81b4af8eccbef20f738142d5c8048f0f4a:/include/wx/dataview.h

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 84fe95f175..2e47397f53 100644
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -21,6 +21,16 @@
 #include "wx/bitmap.h"
 #include "wx/variant.h"
 
+
+#if defined(__WXGTK20__)
+    // for testing
+    // #define wxUSE_GENERICDATAVIEWCTRL 1
+#elif defined(__WXMAC__)
+    #define wxUSE_GENERICDATAVIEWCTRL 1
+#else
+    #define wxUSE_GENERICDATAVIEWCTRL 1
+#endif
+
 // ----------------------------------------------------------------------------
 // wxDataViewCtrl flags 
 // ----------------------------------------------------------------------------
@@ -68,6 +78,7 @@ public:
     virtual bool RowDeleted( size_t row ) = 0;
     virtual bool RowChanged( size_t row ) = 0;
     virtual bool ValueChanged( size_t col, size_t row ) = 0;
+    virtual bool RowsReordered( size_t *new_order ) = 0;
     virtual bool Cleared() = 0;
     
     void SetOwner( wxDataViewListModel *owner ) { m_owner = owner; }
@@ -105,7 +116,7 @@ public:
     // 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;
+    virtual void GetValue( wxVariant &variant, size_t col, size_t row ) = 0;
     // set value, call ValueChanged() afterwards!
     virtual bool SetValue( wxVariant &variant, size_t col, size_t row ) = 0;
 
@@ -116,6 +127,7 @@ public:
     virtual bool RowDeleted( size_t row );
     virtual bool RowChanged( size_t row );
     virtual bool ValueChanged( size_t col, size_t row );
+    virtual bool RowsReordered( size_t *new_order );
     virtual bool Cleared();
 
     // Used internally    
@@ -152,7 +164,7 @@ public:
     // return type as reported by wxVariant
     virtual wxString GetColType( size_t col );
     // get value into a wxVariant
-    virtual wxVariant GetValue( size_t col, size_t row );
+    virtual void GetValue( wxVariant &variant, size_t col, size_t row );
     // set value, call ValueChanged() afterwards!
     virtual bool SetValue( wxVariant &variant, size_t col, size_t row );
 
@@ -163,13 +175,17 @@ public:
     virtual bool RowDeleted( size_t row );
     virtual bool RowChanged( size_t row );
     virtual bool ValueChanged( size_t col, size_t row );
+    virtual bool RowsReordered( size_t *new_order );
     virtual bool Cleared();
 
+    bool ChildValueChanged( size_t col, size_t row );
+
     virtual void Resort();
 
 private:
     wxDataViewListModel             *m_child;
     wxDataViewSortedIndexArray       m_array;
+    wxDataViewListModelNotifier     *m_notifierOnChild;
 
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewSortedListModel)
@@ -203,7 +219,8 @@ public:
     virtual bool GetValue( wxVariant &value )       { return true; }
     virtual bool Validate( wxVariant &value )       { return true; }
     
-    wxString GetVariantType()   { return m_variantType; }
+    wxString GetVariantType()       { return m_variantType; }
+    wxDataViewCellMode GetMode()    { return m_mode; }
     
     void SetOwner( wxDataViewColumn *owner )    { m_owner = owner; }
     wxDataViewColumn* GetOwner()                { return m_owner; }
@@ -287,7 +304,9 @@ protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCtrlBase)
 };
 
-#if defined(__WXGTK20__)
+#if defined(wxUSE_GENERICDATAVIEWCTRL)
+    #include "wx/generic/dataview.h"
+#elif defined(__WXGTK20__)
     #include "wx/gtk/dataview.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/dataview.h"