explain why do you need wxUSE_WXDIB

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

diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h
index 1e398fe662d925181614906c4b62d0132a28152f..13bbda81182923abd9996afbf993bd9f1d20f531 100644 (file)
--- a/include/wx/gtk/dataview.h
+++ b/include/wx/gtk/dataview.h
@@ -83,12 +83,28 @@ class wxDataViewCustomCell: public wxDataViewCell
 {
 public:
     wxDataViewCustomCell( const wxString &varianttype = wxT("string"), 
 {
 public:
     wxDataViewCustomCell( const wxString &varianttype = wxT("string"), 

-                          wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
+                          wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
+                          bool no_init = false );

     ~wxDataViewCustomCell();
     ~wxDataViewCustomCell();

+    bool Init();

     
     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();
     


@@ -99,6 +115,55 @@ protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomCell)
 };
     
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomCell)
 };
     

+// --------------------------------------------------------- 
+// wxDataViewProgressCell
+// --------------------------------------------------------- 
+
+class wxDataViewProgressCell: public wxDataViewCustomCell
+{
+public:
+    wxDataViewProgressCell( const wxString &label = wxEmptyString, 
+                            const wxString &varianttype = wxT("long"), 
+                            wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
+    ~wxDataViewProgressCell();
+    
+    bool SetValue( const wxVariant &value );
+    
+    virtual bool Render( wxRect cell, wxDC *dc, int state );
+    virtual wxSize GetSize();
+    
+private:
+    wxString    m_label;
+    int         m_value;
+    
+protected:
+    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
 // --------------------------------------------------------- 


@@ -152,7 +217,13 @@ public:
            const wxValidator& validator = wxDefaultValidator );
 
     virtual bool AssociateModel( wxDataViewListModel *model );
            const wxValidator& validator = wxDefaultValidator );
 
     virtual bool AssociateModel( wxDataViewListModel *model );

-    virtual bool AppendColumn( wxDataViewColumn *col );    
+    virtual bool AppendColumn( wxDataViewColumn *col );
+    
+private:
+    friend class wxDataViewCtrlDC;
+    friend class wxGtkDataViewListModelNotifier;
+    GtkWidget                   *m_treeview;
+    wxDataViewListModelNotifier *m_notifier;

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