X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6eec70b984525aac09528c32411f19113620e284..4e3762c9e23a318702f361d572a12df2e6e8e1c9:/include/wx/gtk/dataview.h

diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h
index e01b0ece10..0ca210c132 100644
--- a/include/wx/gtk/dataview.h
+++ b/include/wx/gtk/dataview.h
@@ -14,6 +14,8 @@
 
 class WXDLLIMPEXP_FWD_ADV wxDataViewCtrlInternal;
 
+struct _GtkTreePath;
+
 // ---------------------------------------------------------
 // wxDataViewColumn
 // ---------------------------------------------------------
@@ -111,17 +113,19 @@ public:
     wxDataViewCtrl( wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
-           const wxValidator& validator = wxDefaultValidator )
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxDataViewCtrlNameStr )
     {
         Init();
 
-        Create(parent, id, pos, size, style, validator );
+        Create(parent, id, pos, size, style, validator, name);
     }
 
     bool Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
-           const wxValidator& validator = wxDefaultValidator );
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxDataViewCtrlNameStr);
 
     virtual ~wxDataViewCtrl();
 
@@ -171,6 +175,10 @@ public:
     GtkWidget *GtkGetTreeView() { return m_treeview; }
     wxDataViewCtrlInternal* GtkGetInternal() { return m_internal; }
 
+    // Convert GTK path to our item. Returned item may be invalid if get_iter()
+    // failed.
+    wxDataViewItem GTKPathToItem(struct _GtkTreePath *path) const;
+
     virtual void OnInternalIdle();
 
 protected:
@@ -182,15 +190,17 @@ protected:
 private:
     void Init();
 
+    virtual wxDataViewItem DoGetCurrentItem() const;
+    virtual void DoSetCurrentItem(const wxDataViewItem& item);
+
     friend class wxDataViewCtrlDCImpl;
     friend class wxDataViewColumn;
-    friend class wxGtkDataViewModelNotifier;
     friend class wxDataViewCtrlInternal;
 
     GtkWidget               *m_treeview;
-    wxDataViewModelNotifier *m_notifier;
     wxDataViewCtrlInternal  *m_internal;
     wxDataViewColumnList     m_cols;
+    wxDataViewItem           m_ensureVisibleDefered;
 
     virtual void AddChildGTK(wxWindowGTK* child);
     void GtkEnableSelectionEvents();