the wxFormatString hack used in wxFileTypeInfo variadic ctors doesn't work anymore...

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

diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h
index ab007a505a596f95584fa6e43d99c06052b40bc5..6a94076629a356d0b235bc9c20aae417984fd290 100644 (file)
--- a/include/wx/gtk/dataview.h
+++ b/include/wx/gtk/dataview.h
@@ -20,6 +20,7 @@
 // --------------------------------------------------------- 
 
 class WXDLLIMPEXP_FWD_CORE wxDataViewCtrl;
 // --------------------------------------------------------- 
 
 class WXDLLIMPEXP_FWD_CORE wxDataViewCtrl;

+class WXDLLIMPEXP_FWD_CORE wxDataViewCtrlInternal;

 
 
 // --------------------------------------------------------- 
 
 
 // --------------------------------------------------------- 


@@ -304,14 +305,31 @@ public:
 
     virtual bool AssociateModel( wxDataViewModel *model );
     virtual bool AppendColumn( wxDataViewColumn *col );
 
     virtual bool AssociateModel( wxDataViewModel *model );
     virtual bool AppendColumn( wxDataViewColumn *col );

-    
-    // selection code
+
+    virtual wxDataViewItem GetSelection();
+    virtual int GetSelections( wxDataViewItemArray & sel ) const;
+    virtual void SetSelections( const wxDataViewItemArray & sel );
+    virtual void Select( const wxDataViewItem & item );
+    virtual void Unselect( const wxDataViewItem & item );
+    virtual bool IsSelected( const wxDataViewItem & item ) const;
+    virtual void SelectAll();
+    virtual void UnselectAll();
+
+    virtual void EnsureVisible( const wxDataViewItem & item, wxDataViewColumn *column = NULL );
+
+    virtual void HitTest( const wxPoint &point, 
+                          wxDataViewItem &item, unsigned int &column ) const;
+    virtual wxRect GetItemRect( const wxDataViewItem &item, 
+                          unsigned int column ) const;
+

 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
     
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
     

-    GtkWidget *GtkGetTreeView() { return m_treeview; }

     wxWindow *GetMainWindow() { return (wxWindow*) this; }
     wxWindow *GetMainWindow() { return (wxWindow*) this; }

+    
+    GtkWidget *GtkGetTreeView() { return m_treeview; }
+    wxDataViewCtrlInternal* GtkGetInternal() { return m_internal; }

 
 protected:
     virtual void DoSetExpanderColumn();
 
 protected:
     virtual void DoSetExpanderColumn();


@@ -323,6 +341,7 @@ private:
     friend class wxGtkDataViewModelNotifier;
     GtkWidget               *m_treeview;
     wxDataViewModelNotifier *m_notifier;
     friend class wxGtkDataViewModelNotifier;
     GtkWidget               *m_treeview;
     wxDataViewModelNotifier *m_notifier;

+    wxDataViewCtrlInternal  *m_internal;

 
     
     virtual void OnInternalIdle();
 
     
     virtual void OnInternalIdle();