Add support for the new history functions to the ie backend. For this we manage our...

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

diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h
index 06649c507f89b5ad9cd9ecec46ff16e53574f56d..03bcbdf1c30cc3a3a0ec41808e3687438fac7d1a 100644 (file)
--- a/include/wx/gtk/dataview.h
+++ b/include/wx/gtk/dataview.h
@@ -46,7 +46,7 @@ public:
     virtual void SetSortOrder( bool ascending );
     virtual void SetAsSortKey(bool sort = true);
 
     virtual void SetSortOrder( bool ascending );
     virtual void SetAsSortKey(bool sort = true);
 

-    virtual void SetResizeable( bool resizeable );
+    virtual void SetResizeable( bool resizable );

     virtual void SetHidden( bool hidden );
 
     virtual void SetMinWidth( int minWidth );
     virtual void SetHidden( bool hidden );
 
     virtual void SetMinWidth( int minWidth );


@@ -76,8 +76,7 @@ public:
     virtual int GetFlags() const { return GetFromIndividualFlags(); }
 
     // implementation
     virtual int GetFlags() const { return GetFromIndividualFlags(); }
 
     // implementation

-    GtkWidget* GetGtkHandle() { return m_column; }
-    GtkWidget* GetConstGtkHandle() const { return m_column; }
+    GtkWidget* GetGtkHandle() const { return m_column; }

 
 private:
     // holds the GTK handle
 
 private:
     // holds the GTK handle


@@ -193,15 +192,20 @@ private:
     virtual wxDataViewItem DoGetCurrentItem() const;
     virtual void DoSetCurrentItem(const wxDataViewItem& item);
 
     virtual wxDataViewItem DoGetCurrentItem() const;
     virtual void DoSetCurrentItem(const wxDataViewItem& item);
 

+    // Return wxDataViewColumn matching the given GtkTreeViewColumn.
+    //
+    // If the input argument is NULL, return NULL too. Otherwise we must find
+    // the matching column and assert if we didn't.
+    wxDataViewColumn* FromGTKColumn(GtkTreeViewColumn *gtk_col) const;
+

     friend class wxDataViewCtrlDCImpl;
     friend class wxDataViewColumn;
     friend class wxDataViewCtrlDCImpl;
     friend class wxDataViewColumn;

-    friend class wxGtkDataViewModelNotifier;

     friend class wxDataViewCtrlInternal;
 
     GtkWidget               *m_treeview;
     friend class wxDataViewCtrlInternal;
 
     GtkWidget               *m_treeview;

-    wxDataViewModelNotifier *m_notifier;

     wxDataViewCtrlInternal  *m_internal;
     wxDataViewColumnList     m_cols;
     wxDataViewCtrlInternal  *m_internal;
     wxDataViewColumnList     m_cols;

+    wxDataViewItem           m_ensureVisibleDefered;

 
     virtual void AddChildGTK(wxWindowGTK* child);
     void GtkEnableSelectionEvents();
 
     virtual void AddChildGTK(wxWindowGTK* child);
     void GtkEnableSelectionEvents();