Wine fixes

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

diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h
index 89d16535c0152888ac92226b6ee12e0a681cd24e..a8800e37aa73e291d9c83f0bb1add01390b2bea6 100644 (file)
--- a/include/wx/generic/dataview.h
+++ b/include/wx/generic/dataview.h
@@ -15,6 +15,7 @@
 #include "wx/list.h"
 #include "wx/control.h"
 #include "wx/scrolwin.h"
 #include "wx/list.h"
 #include "wx/control.h"
 #include "wx/scrolwin.h"

+#include "wx/icon.h"

 
 // ---------------------------------------------------------
 // classes
 
 // ---------------------------------------------------------
 // classes


@@ -25,41 +26,41 @@ class WXDLLIMPEXP_ADV wxDataViewMainWindow;
 class WXDLLIMPEXP_ADV wxDataViewHeaderWindow;
 
 // ---------------------------------------------------------
 class WXDLLIMPEXP_ADV wxDataViewHeaderWindow;
 
 // ---------------------------------------------------------

-// wxDataViewCell
+// wxDataViewRenderer

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

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

 {
 public:
 {
 public:

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

 
     virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0;
     virtual wxSize GetSize() = 0;
 
     virtual bool Activate( wxRect WXUNUSED(cell),
                            wxDataViewListModel *WXUNUSED(model),
 
     virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0;
     virtual wxSize GetSize() = 0;
 
     virtual bool Activate( wxRect WXUNUSED(cell),
                            wxDataViewListModel *WXUNUSED(model),

-                           size_t WXUNUSED(col),
-                           size_t WXUNUSED(row) )
+                           unsigned int WXUNUSED(col),
+                           unsigned int WXUNUSED(row) )

                            { return false; }
 
     virtual bool LeftClick( wxPoint WXUNUSED(cursor),
                             wxRect WXUNUSED(cell),
                             wxDataViewListModel *WXUNUSED(model),
                            { return false; }
 
     virtual bool LeftClick( wxPoint WXUNUSED(cursor),
                             wxRect WXUNUSED(cell),
                             wxDataViewListModel *WXUNUSED(model),

-                            size_t WXUNUSED(col),
-                            size_t WXUNUSED(row) )
+                            unsigned int WXUNUSED(col),
+                            unsigned int WXUNUSED(row) )

                             { return false; }
     virtual bool RightClick( wxPoint WXUNUSED(cursor),
                              wxRect WXUNUSED(cell),
                              wxDataViewListModel *WXUNUSED(model),
                             { return false; }
     virtual bool RightClick( wxPoint WXUNUSED(cursor),
                              wxRect WXUNUSED(cell),
                              wxDataViewListModel *WXUNUSED(model),

-                             size_t WXUNUSED(col),
-                             size_t WXUNUSED(row) )
+                             unsigned int WXUNUSED(col),
+                             unsigned int WXUNUSED(row) )

                              { return false; }
     virtual bool StartDrag( wxPoint WXUNUSED(cursor),
                             wxRect WXUNUSED(cell),
                             wxDataViewListModel *WXUNUSED(model),
                              { return false; }
     virtual bool StartDrag( wxPoint WXUNUSED(cursor),
                             wxRect WXUNUSED(cell),
                             wxDataViewListModel *WXUNUSED(model),

-                            size_t WXUNUSED(col),
-                            size_t WXUNUSED(row) )
+                            unsigned int WXUNUSED(col),
+                            unsigned int WXUNUSED(row) )

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


@@ -69,32 +70,32 @@ private:
     wxDC        *m_dc;
 
 protected:
     wxDC        *m_dc;
 
 protected:

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCell)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer)

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

-// wxDataViewCustomCell
+// wxDataViewCustomRenderer

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

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

 {
 public:
 {
 public:

-    wxDataViewCustomCell( const wxString &varianttype = wxT("string"),
-                          wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
+    wxDataViewCustomRenderer( const wxString &varianttype = wxT("string"),
+                              wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );

 
 protected:
 
 protected:

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomCell)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer)

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

-// wxDataViewTextCell
+// wxDataViewTextRenderer

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

-class WXDLLIMPEXP_ADV wxDataViewTextCell: public wxDataViewCustomCell
+class WXDLLIMPEXP_ADV wxDataViewTextRenderer: public wxDataViewCustomRenderer

 {
 public:
 {
 public:

-    wxDataViewTextCell( const wxString &varianttype = wxT("string"),
-                        wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
+    wxDataViewTextRenderer( const wxString &varianttype = wxT("string"),
+                            wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );

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


@@ -106,44 +107,68 @@ private:
     wxString m_text;
 
 protected:
     wxString m_text;
 
 protected:

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextCell)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer)
+};
+
+// ---------------------------------------------------------
+// wxDataViewBitmapRenderer
+// ---------------------------------------------------------
+
+class WXDLLIMPEXP_ADV wxDataViewBitmapRenderer: public wxDataViewCustomRenderer
+{
+public:
+    wxDataViewBitmapRenderer( const wxString &varianttype = wxT("wxBitmap"),
+                              wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
+
+    bool SetValue( const wxVariant &value );
+    bool GetValue( wxVariant &value );
+
+    bool Render( wxRect cell, wxDC *dc, int state );
+    wxSize GetSize();
+
+private:
+    wxIcon m_icon;
+    wxBitmap m_bitmap;
+
+protected:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer)

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

-// wxDataViewToggleCell
+// wxDataViewToggleRenderer

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

-class WXDLLIMPEXP_ADV wxDataViewToggleCell: public wxDataViewCustomCell
+class WXDLLIMPEXP_ADV wxDataViewToggleRenderer: public wxDataViewCustomRenderer

 {
 public:
 {
 public:

-    wxDataViewToggleCell( const wxString &varianttype = wxT("bool"),
-                        wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
+    wxDataViewToggleRenderer( const wxString &varianttype = wxT("bool"),
+                              wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );

 
     bool SetValue( const wxVariant &value );
     bool GetValue( wxVariant &value );
 
     bool Render( wxRect cell, wxDC *dc, int state );
 
     bool SetValue( const wxVariant &value );
     bool GetValue( wxVariant &value );
 
     bool Render( wxRect cell, wxDC *dc, int state );

-    bool Activate( wxRect cell, wxDataViewListModel *model, size_t col, size_t row );
+    bool Activate( wxRect cell, wxDataViewListModel *model, unsigned int col, unsigned int row );

     wxSize GetSize();
 
 private:
     bool    m_toggle;
 
 protected:
     wxSize GetSize();
 
 private:
     bool    m_toggle;
 
 protected:

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleCell)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer)

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

-// wxDataViewProgressCell
+// wxDataViewProgressRenderer

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

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

 {
 public:
 {
 public:

-    wxDataViewProgressCell( const wxString &label = wxEmptyString,
-                            const wxString &varianttype = wxT("long"),
-                            wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
-    ~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 );
 


@@ -155,31 +180,31 @@ private:
     int         m_value;
 
 protected:
     int         m_value;
 
 protected:

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressCell)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer)

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

-// wxDataViewDateCell
+// wxDataViewDateRenderer

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

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

 {
 public:
 {
 public:

-    wxDataViewDateCell( const wxString &varianttype = wxT("datetime"),
-                        wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE );
+    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,
 
     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 );
+                           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)

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


@@ -189,20 +214,26 @@ protected:
 class WXDLLIMPEXP_ADV wxDataViewColumn: public wxDataViewColumnBase
 {
 public:
 class WXDLLIMPEXP_ADV 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 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();
 

-    virtual void SetFixedWidth( int width );
-    virtual int GetFixedWidth();
-    

 private:
     int                      m_width;
 private:
     int                      m_width;

-    wxDataViewColumnSizing   m_sizing;

     int                      m_fixedWidth;
 
 protected:
     int                      m_fixedWidth;
 
 protected:


@@ -243,6 +274,15 @@ 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;
+

 private:
     friend class wxDataViewMainWindow;
     friend class wxDataViewHeaderWindow;
 private:
     friend class wxDataViewMainWindow;
     friend class wxDataViewHeaderWindow;