Compile fix for the version of VC8 included in the 2003 PSDK.

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

diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h
index c31e2fc50b0496ccdd80787a8badbce7c224d82d..e575a4f2c087c8e9d46f1d2a261d806667597789 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,88 +38,88 @@ 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 );
     bool GetValue( wxVariant &value );
     
 protected:
                         wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
 
     bool SetValue( const wxVariant &value );
     bool GetValue( wxVariant &value );
     
 protected:

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextCell)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer)

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

-// wxDataViewBitmapCell
+// wxDataViewBitmapRenderer

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

-class wxDataViewBitmapCell: public wxDataViewCell
+class wxDataViewBitmapRenderer: public wxDataViewRenderer

 {
 public:
 {
 public:

-    wxDataViewBitmapCell( const wxString &varianttype = wxT("wxBitmap"), 
-                        wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
+    wxDataViewBitmapRenderer( const wxString &varianttype = wxT("wxBitmap"), 
+                              wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );

 
     bool SetValue( const wxVariant &value );
     bool GetValue( wxVariant &value );
     
 protected:
 
     bool SetValue( const wxVariant &value );
     bool GetValue( wxVariant &value );
     
 protected:

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapCell)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer)

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

-// wxDataViewToggleCell
+// wxDataViewToggleRenderer

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

-class wxDataViewToggleCell: public wxDataViewCell
+class wxDataViewToggleRenderer: public wxDataViewRenderer

 {
 public:
 {
 public:

-    wxDataViewToggleCell( const wxString &varianttype = wxT("bool"), 
+    wxDataViewToggleRenderer( const wxString &varianttype = wxT("bool"), 

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

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleCell)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer)

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

-// wxDataViewCustomCell
+// wxDataViewCustomRenderer

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

-class wxDataViewCustomCell: public wxDataViewCell
+class wxDataViewCustomRenderer: public wxDataViewRenderer

 {
 public:
 {
 public:

-    wxDataViewCustomCell( const wxString &varianttype = wxT("string"), 
-                          wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
-                          bool no_init = false );
-    virtual ~wxDataViewCustomCell();
+    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,
     bool Init();
     
     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 )   
+                           wxDataViewListModel *model, unsigned int col, unsigned int row )   

                            { return false; }
     
     virtual bool LeftClick( wxPoint cursor, wxRect cell, 
                            { return false; }
     
     virtual bool LeftClick( wxPoint cursor, wxRect cell, 

-                           wxDataViewListModel *model, size_t col, size_t row )   
+                           wxDataViewListModel *model, unsigned int col, unsigned int row )   

                            { return false; }
     virtual bool RightClick( wxPoint cursor, wxRect cell,
                            { return false; }
     virtual bool RightClick( wxPoint cursor, wxRect cell,

-                           wxDataViewListModel *model, size_t col, size_t row )   
+                           wxDataViewListModel *model, unsigned int col, unsigned int row )   

                            { return false; }
     virtual bool StartDrag( wxPoint cursor, wxRect cell, 
                            { return false; }
     virtual bool StartDrag( wxPoint cursor, wxRect cell, 

-                           wxDataViewListModel *model, size_t col, size_t row )   
+                           wxDataViewListModel *model, unsigned int col, unsigned int row )   

                            { return false; }
     
     // Create DC on request
                            { return false; }
     
     // Create DC on request


@@ -129,20 +129,20 @@ private:
     wxDC        *m_dc;
     
 protected:
     wxDC        *m_dc;
     
 protected:

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomCell)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer)

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

-// wxDataViewProgressCell
+// wxDataViewProgressRenderer

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

-class wxDataViewProgressCell: public wxDataViewCustomCell
+class wxDataViewProgressRenderer: public wxDataViewCustomRenderer

 {
 public:
 {
 public:

-    wxDataViewProgressCell( const wxString &label = wxEmptyString, 
-                            const wxString &varianttype = wxT("long"), 
-                            wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
-    virtual ~wxDataViewProgressCell();
+    wxDataViewProgressRenderer( const wxString &label = wxEmptyString, 
+                                const wxString &varianttype = wxT("long"), 
+                                wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
+    virtual ~wxDataViewProgressRenderer();

     
     bool SetValue( const wxVariant &value );
     
     
     bool SetValue( const wxVariant &value );
     


@@ -154,17 +154,17 @@ private:
     int         m_value;
     
 protected:
     int         m_value;
     
 protected:

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressCell)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer)

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

-// wxDataViewDateCell
+// wxDataViewDateRenderer

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

-class wxDataViewDateCell: public wxDataViewCustomCell
+class wxDataViewDateRenderer: public wxDataViewCustomRenderer

 {
 public:
 {
 public:

-    wxDataViewDateCell( const wxString &varianttype = wxT("datetime"), 
+    wxDataViewDateRenderer( const wxString &varianttype = wxT("datetime"), 

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


@@ -172,13 +172,13 @@ public:
     virtual bool Render( wxRect cell, wxDC *dc, int state );
     virtual wxSize GetSize();
     virtual bool Activate( wxRect cell,
     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 );
+                           wxDataViewListModel *model, unsigned int col, unsigned int row );

     
 private:
     wxDateTime    m_date;
     
 protected:
     
 private:
     wxDateTime    m_date;
     
 protected:

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateCell)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateRenderer)

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


@@ -188,11 +188,23 @@ 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 fixed_width = 80, wxDataViewColumnSizing sizing = wxDATAVIEW_COL_WIDTH_FIXED, 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 SetOwner( wxDataViewCtrl *owner );
+
+    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 int GetWidth();
     


@@ -205,7 +217,12 @@ public:
 private:
     // holds the GTK handle
     void*   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)
 };


@@ -242,12 +259,27 @@ public:
     virtual bool AssociateModel( wxDataViewListModel *model );
     virtual bool AppendColumn( wxDataViewColumn *col );
     
     virtual bool AssociateModel( wxDataViewListModel *model );
     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;
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+    

 private:
     friend class wxDataViewCtrlDC;
 private:
     friend class wxDataViewCtrlDC;

+    friend class wxDataViewColumn;

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

+    virtual void OnInternalIdle();
+    

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