Tinderbox build fix for wxUnivGTK build.

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

diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h
index 5cf7e587e1b4d09cdf91a2bca9a62cea8a89716e..9afb521ac9ab87e4e8d0d0597454889c7b77a78a 100644 (file)
--- a/include/wx/gtk/dataview.h
+++ b/include/wx/gtk/dataview.h
@@ -91,6 +91,20 @@ public:
     virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0;
     virtual wxSize GetSize() = 0;
     
     virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0;
     virtual wxSize GetSize() = 0;
     

+    virtual bool Activate( wxRect cell,
+                           wxDataViewListModel *model, size_t col, size_t row )   
+                           { return false; }
+    
+    virtual bool LeftClick( wxPoint cursor, wxRect cell, 
+                           wxDataViewListModel *model, size_t col, size_t row )   
+                           { return false; }
+    virtual bool RightClick( wxPoint cursor, wxRect cell,
+                           wxDataViewListModel *model, size_t col, size_t row )   
+                           { return false; }
+    virtual bool StartDrag( wxPoint cursor, wxRect cell, 
+                           wxDataViewListModel *model, size_t col, size_t row )   
+                           { return false; }
+    

     // Create DC on request
     virtual wxDC *GetDC();
     
     // Create DC on request
     virtual wxDC *GetDC();
     


@@ -126,6 +140,30 @@ protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressCell)
 };
     
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressCell)
 };
     

+// --------------------------------------------------------- 
+// wxDataViewDateCell
+// --------------------------------------------------------- 
+
+class wxDataViewDateCell: public wxDataViewCustomCell
+{
+public:
+    wxDataViewDateCell( const wxString &varianttype = wxT("datetime"), 
+                        wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE );
+    
+    bool SetValue( const wxVariant &value );
+    
+    virtual bool Render( wxRect cell, wxDC *dc, int state );
+    virtual wxSize GetSize();
+    virtual bool Activate( wxRect cell,
+                           wxDataViewListModel *model, size_t col, size_t row );
+    
+private:
+    wxDateTime    m_date;
+    
+protected:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateCell)
+};
+    

 // --------------------------------------------------------- 
 // wxDataViewColumn
 // --------------------------------------------------------- 
 // --------------------------------------------------------- 
 // wxDataViewColumn
 // --------------------------------------------------------- 


@@ -133,11 +171,17 @@ protected:
 class WXDLLIMPEXP_CORE wxDataViewColumn: public wxDataViewColumnBase
 {
 public:
 class WXDLLIMPEXP_CORE wxDataViewColumn: public wxDataViewColumnBase
 {
 public:

-    wxDataViewColumn( const wxString &title, wxDataViewCell *cell, size_t model_column, int flags = 0 );
+    wxDataViewColumn( const wxString &title, wxDataViewCell *cell, size_t model_column,
+        int fixed_width = 80, wxDataViewColumnSizing sizing = wxDATAVIEW_COL_WIDTH_FIXED, int flags = 0 );

     virtual ~wxDataViewColumn();
 
     virtual void SetTitle( const wxString &title );
 
     virtual ~wxDataViewColumn();
 
     virtual void SetTitle( const wxString &title );
 

+    virtual int GetWidth();
+    
+    virtual void SetFixedWidth( int width );
+    virtual int GetFixedWidth();
+    

     // implementation
     void* GetGtkHandle() { return m_column; }
 
     // implementation
     void* GetGtkHandle() { return m_column; }
 


@@ -183,7 +227,9 @@ public:
     
 private:
     friend class wxDataViewCtrlDC;
     
 private:
     friend class wxDataViewCtrlDC;

-    GtkWidget       *m_treeview;
+    friend class wxGtkDataViewListModelNotifier;
+    GtkWidget                   *m_treeview;
+    wxDataViewListModelNotifier *m_notifier;

     
 private:
     DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)
     
 private:
     DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)