enabling alpha on msw colour

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

diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h
index 8ab53b955840502d5e15a23ae64aa3d8cffea0d7..c31e2fc50b0496ccdd80787a8badbce7c224d82d 100644 (file)
--- a/include/wx/gtk/dataview.h
+++ b/include/wx/gtk/dataview.h
@@ -58,6 +58,23 @@ protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextCell)
 };
     
+// --------------------------------------------------------- 
+// wxDataViewBitmapCell
+// --------------------------------------------------------- 
+
+class wxDataViewBitmapCell: public wxDataViewCell
+{
+public:
+    wxDataViewBitmapCell( const wxString &varianttype = wxT("wxBitmap"), 
+                        wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
+
+    bool SetValue( const wxVariant &value );
+    bool GetValue( wxVariant &value );
+    
+protected:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapCell)
+};
+    
 // --------------------------------------------------------- 
 // wxDataViewToggleCell
 // --------------------------------------------------------- 
@@ -85,12 +102,25 @@ public:
     wxDataViewCustomCell( const wxString &varianttype = wxT("string"), 
                           wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
                           bool no_init = false );
-    ~wxDataViewCustomCell();
+    virtual ~wxDataViewCustomCell();
     bool Init();
     
     virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0;
     virtual wxSize GetSize() = 0;
-    virtual bool Activate( wxRect cell ) { return false; };
+    
+    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();
@@ -112,7 +142,7 @@ public:
     wxDataViewProgressCell( const wxString &label = wxEmptyString, 
                             const wxString &varianttype = wxT("long"), 
                             wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
-    ~wxDataViewProgressCell();
+    virtual ~wxDataViewProgressCell();
     
     bool SetValue( const wxVariant &value );
     
@@ -127,6 +157,30 @@ 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
 // --------------------------------------------------------- 
@@ -134,11 +188,17 @@ protected:
 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 int GetWidth();
+    
+    virtual void SetFixedWidth( int width );
+    virtual int GetFixedWidth();
+    
     // implementation
     void* GetGtkHandle() { return m_column; }
 
@@ -184,7 +244,9 @@ public:
     
 private:
     friend class wxDataViewCtrlDC;
-    GtkWidget       *m_treeview;
+    friend class wxGtkDataViewListModelNotifier;
+    GtkWidget                   *m_treeview;
+    wxDataViewListModelNotifier *m_notifier;
     
 private:
     DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)