Commited region iterator fix.

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

diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h
index b7841cf6d7670837d9660239e28716dfc4a659ad..6965502b28dd901b5f753fbb2103259a09c63dee 100644 (file)
--- a/include/wx/gtk/dataview.h
+++ b/include/wx/gtk/dataview.h
@@ -22,13 +22,13 @@
 class WXDLLIMPEXP_CORE wxDataViewCtrl;
 
 // --------------------------------------------------------- 
 class WXDLLIMPEXP_CORE wxDataViewCtrl;
 
 // --------------------------------------------------------- 

-// wxDataViewCell
+// wxDataViewRenderer

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

-class wxDataViewCell: public wxDataViewCellBase
+class wxDataViewRenderer: public wxDataViewRendererBase

 {
 public:
 {
 public:

-    wxDataViewCell( const wxString &varianttype, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
+    wxDataViewRenderer( const wxString &varianttype, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );

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


@@ -38,23 +38,147 @@ protected:
     void*   m_renderer;
 
 protected:
     void*   m_renderer;
 
 protected:

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCell)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer)

 };
     
 // --------------------------------------------------------- 
 };
     
 // --------------------------------------------------------- 

-// wxDataViewTextCell
+// wxDataViewTextRenderer

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

-class wxDataViewTextCell: public wxDataViewCell
+class wxDataViewTextRenderer: public wxDataViewRenderer

 {
 public:
 {
 public:

-    wxDataViewTextCell( const wxString &varianttype = wxT("string"), 
+    wxDataViewTextRenderer( const wxString &varianttype = wxT("string"), 

                         wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
 
     bool SetValue( const wxVariant &value );
                         wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
 
     bool SetValue( const wxVariant &value );

+    bool GetValue( wxVariant &value );

     
 protected:
     
 protected:

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextCell)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer)
+};
+    
+// --------------------------------------------------------- 
+// wxDataViewBitmapRenderer
+// --------------------------------------------------------- 
+
+class wxDataViewBitmapRenderer: public wxDataViewRenderer
+{
+public:
+    wxDataViewBitmapRenderer( 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(wxDataViewBitmapRenderer)
+};
+    
+// --------------------------------------------------------- 
+// wxDataViewToggleRenderer
+// --------------------------------------------------------- 
+
+class wxDataViewToggleRenderer: public wxDataViewRenderer
+{
+public:
+    wxDataViewToggleRenderer( const wxString &varianttype = wxT("bool"), 
+                        wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
+
+    bool SetValue( const wxVariant &value );
+    bool GetValue( wxVariant &value );
+    
+protected:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer)
+};
+    
+// --------------------------------------------------------- 
+// wxDataViewCustomRenderer
+// --------------------------------------------------------- 
+
+class wxDataViewCustomRenderer: public wxDataViewRenderer
+{
+public:
+    wxDataViewCustomRenderer( const wxString &varianttype = wxT("string"), 
+                              wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
+                              bool no_init = false );
+    virtual ~wxDataViewCustomRenderer();
+    bool Init();
+    
+    virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0;
+    virtual wxSize GetSize() = 0;
+    
+    virtual bool Activate( wxRect cell,
+                           wxDataViewListModel *model, unsigned int col, unsigned int row )   
+                           { return false; }
+    
+    virtual bool LeftClick( wxPoint cursor, wxRect cell, 
+                           wxDataViewListModel *model, unsigned int col, unsigned int row )   
+                           { return false; }
+    virtual bool RightClick( wxPoint cursor, wxRect cell,
+                           wxDataViewListModel *model, unsigned int col, unsigned int row )   
+                           { return false; }
+    virtual bool StartDrag( wxPoint cursor, wxRect cell, 
+                           wxDataViewListModel *model, unsigned int col, unsigned int row )   
+                           { return false; }
+    
+    // Create DC on request
+    virtual wxDC *GetDC();
+    
+private:
+    wxDC        *m_dc;
+    
+protected:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer)
+};
+    
+// --------------------------------------------------------- 
+// wxDataViewProgressRenderer
+// --------------------------------------------------------- 
+
+class wxDataViewProgressRenderer: public wxDataViewCustomRenderer
+{
+public:
+    wxDataViewProgressRenderer( const wxString &label = wxEmptyString, 
+                                const wxString &varianttype = wxT("long"), 
+                                wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
+    virtual ~wxDataViewProgressRenderer();
+    
+    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(wxDataViewProgressRenderer)
+};
+    
+// --------------------------------------------------------- 
+// wxDataViewDateRenderer
+// --------------------------------------------------------- 
+
+class wxDataViewDateRenderer: public wxDataViewCustomRenderer
+{
+public:
+    wxDataViewDateRenderer( 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, unsigned int col, unsigned int row );
+    
+private:
+    wxDateTime    m_date;
+    
+protected:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateRenderer)

 };
     
 // --------------------------------------------------------- 
 };
     
 // --------------------------------------------------------- 


@@ -64,18 +188,39 @@ 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, wxDataViewRenderer *renderer, unsigned int model_column,
+        int width = 80, int flags = wxDATAVIEW_COL_RESIZABLE );
+    wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *renderer, unsigned int model_column,
+        int width = 80, int flags = wxDATAVIEW_COL_RESIZABLE );

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

+    virtual void SetBitmap( const wxBitmap &bitmap );

 
 

+    virtual void SetAlignment( wxAlignment align );
+    
+    virtual void SetSortable( bool sortable );
+    virtual bool GetSortable();
+    virtual void SetSortOrder( bool ascending );
+    virtual bool IsSortOrderAscending();
+
+    virtual int GetWidth();
+    
+    virtual void SetFixedWidth( int width );
+    virtual int GetFixedWidth();
+    

     // implementation
     void* GetGtkHandle() { return m_column; }
 
 private:
     // holds the GTK handle
     void*   m_column;
     // implementation
     void* GetGtkHandle() { return m_column; }
 
 private:
     // holds the GTK handle
     void*   m_column;

-
+    
+    // delayed connection to mouse events
+    friend class wxDataViewCtrl;
+    void OnInternalIdle();
+    bool    m_isConnected;  
+    

 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewColumn)
 };
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewColumn)
 };


@@ -110,7 +255,25 @@ 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 );
+    
+    virtual void SetSelection( int row ); // -1 for unselect
+    virtual void SetSelectionRange( unsigned int from, unsigned int to );
+    virtual void SetSelections( const wxArrayInt& aSelections);
+    virtual void Unselect( unsigned int row );
+    
+    virtual bool IsSelected( unsigned int row ) const;
+    virtual int GetSelection() const;
+    virtual int GetSelections(wxArrayInt& aSelections) const;
+    
+private:
+    friend class wxDataViewCtrlDC;
+    friend class wxDataViewColumn;
+    friend class wxGtkDataViewListModelNotifier;
+    GtkWidget                   *m_treeview;
+    wxDataViewListModelNotifier *m_notifier;
+    
+    virtual void OnInternalIdle();

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