Wine fixes

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

diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h
index c1df3d63dc908c5e23e7285210c75196bad51576..a8800e37aa73e291d9c83f0bb1add01390b2bea6 100644 (file)
--- a/include/wx/generic/dataview.h
+++ b/include/wx/generic/dataview.h
@@ -15,188 +15,236 @@
 #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

-// --------------------------------------------------------- 
+// ---------------------------------------------------------

 
 

-class WXDLLIMPEXP_CORE wxDataViewCtrl;
-class WXDLLIMPEXP_CORE wxDataViewMainWindow;
-class WXDLLIMPEXP_CORE wxDataViewHeaderWindow;
+class WXDLLIMPEXP_ADV wxDataViewCtrl;
+class WXDLLIMPEXP_ADV wxDataViewMainWindow;
+class WXDLLIMPEXP_ADV wxDataViewHeaderWindow;

 
 

-// --------------------------------------------------------- 
-// wxDataViewCell
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
+// wxDataViewRenderer
+// ---------------------------------------------------------

 
 

-class 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 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 )   
+
+    virtual bool Activate( wxRect WXUNUSED(cell),
+                           wxDataViewListModel *WXUNUSED(model),
+                           unsigned int WXUNUSED(col),
+                           unsigned int WXUNUSED(row) )

                            { return false; }
                            { return false; }

-    
+
+    virtual bool LeftClick( wxPoint WXUNUSED(cursor),
+                            wxRect WXUNUSED(cell),
+                            wxDataViewListModel *WXUNUSED(model),
+                            unsigned int WXUNUSED(col),
+                            unsigned int WXUNUSED(row) )
+                            { return false; }
+    virtual bool RightClick( wxPoint WXUNUSED(cursor),
+                             wxRect WXUNUSED(cell),
+                             wxDataViewListModel *WXUNUSED(model),
+                             unsigned int WXUNUSED(col),
+                             unsigned int WXUNUSED(row) )
+                             { return false; }
+    virtual bool StartDrag( wxPoint WXUNUSED(cursor),
+                            wxRect WXUNUSED(cell),
+                            wxDataViewListModel *WXUNUSED(model),
+                            unsigned int WXUNUSED(col),
+                            unsigned int WXUNUSED(row) )
+                            { return false; }
+

     // Create DC on request
     virtual wxDC *GetDC();
     // Create DC on request
     virtual wxDC *GetDC();

-    
+

 private:
     wxDC        *m_dc;
 private:
     wxDC        *m_dc;

-    
+

 protected:
 protected:

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCell)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer)

 };
 };

-    
-// --------------------------------------------------------- 
-// wxDataViewCustomCell
-// --------------------------------------------------------- 

 
 

-class wxDataViewCustomCell: public wxDataViewCell
+// ---------------------------------------------------------
+// wxDataViewCustomRenderer
+// ---------------------------------------------------------
+
+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
-// --------------------------------------------------------- 

 
 

-class wxDataViewTextCell: public wxDataViewCustomCell
+// ---------------------------------------------------------
+// wxDataViewTextRenderer
+// ---------------------------------------------------------
+
+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 );

-    
+

     bool Render( wxRect cell, wxDC *dc, int state );
     wxSize GetSize();
     bool Render( wxRect cell, wxDC *dc, int state );
     wxSize GetSize();

-    
+

 private:
     wxString m_text;
 private:
     wxString m_text;

-    
+

 protected:
 protected:

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextCell)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer)

 };
 };

-    
-// --------------------------------------------------------- 
-// wxDataViewToggleCell
-// --------------------------------------------------------- 

 
 

-class wxDataViewToggleCell: public wxDataViewCustomCell
+// ---------------------------------------------------------
+// wxDataViewBitmapRenderer
+// ---------------------------------------------------------
+
+class WXDLLIMPEXP_ADV wxDataViewBitmapRenderer: public wxDataViewCustomRenderer

 {
 public:
 {
 public:

-    wxDataViewToggleCell( const wxString &varianttype = wxT("bool"), 
-                        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 );
 
     bool SetValue( const wxVariant &value );
     bool GetValue( wxVariant &value );

-    
+

     bool Render( wxRect cell, wxDC *dc, int state );
     wxSize GetSize();
     bool Render( wxRect cell, wxDC *dc, int state );
     wxSize GetSize();

-    
+
+private:
+    wxIcon m_icon;
+    wxBitmap m_bitmap;
+
+protected:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer)
+};
+
+// ---------------------------------------------------------
+// wxDataViewToggleRenderer
+// ---------------------------------------------------------
+
+class WXDLLIMPEXP_ADV wxDataViewToggleRenderer: public wxDataViewCustomRenderer
+{
+public:
+    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 Activate( wxRect cell, wxDataViewListModel *model, unsigned int col, unsigned int row );
+    wxSize GetSize();
+

 private:
     bool    m_toggle;
 private:
     bool    m_toggle;

-    
+

 protected:
 protected:

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleCell)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer)

 };
 };

-    
-// --------------------------------------------------------- 
-// wxDataViewProgressCell
-// --------------------------------------------------------- 

 
 

-class wxDataViewProgressCell: public wxDataViewCustomCell
+// ---------------------------------------------------------
+// wxDataViewProgressRenderer
+// ---------------------------------------------------------
+
+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 );

-    
+

     virtual bool Render( wxRect cell, wxDC *dc, int state );
     virtual wxSize GetSize();
     virtual bool Render( wxRect cell, wxDC *dc, int state );
     virtual wxSize GetSize();

-    
+

 private:
     wxString    m_label;
     int         m_value;
 private:
     wxString    m_label;
     int         m_value;

-    
+

 protected:
 protected:

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressCell)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer)

 };
 };

-    
-// --------------------------------------------------------- 
-// wxDataViewDateCell
-// --------------------------------------------------------- 

 
 

-class wxDataViewDateCell: public wxDataViewCustomCell
+// ---------------------------------------------------------
+// wxDataViewDateRenderer
+// ---------------------------------------------------------
+
+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 );
     bool SetValue( const wxVariant &value );

-    
+

     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;
 private:
     wxDateTime    m_date;

-    
+

 protected:
 protected:

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateCell)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateRenderer)

 };
 };

-    
-// --------------------------------------------------------- 
+
+// ---------------------------------------------------------

 // wxDataViewColumn
 // wxDataViewColumn

-// --------------------------------------------------------- 
+// ---------------------------------------------------------

 
 

-class WXDLLIMPEXP_CORE wxDataViewColumn: public wxDataViewColumnBase
+class WXDLLIMPEXP_ADV wxDataViewColumn: public wxDataViewColumnBase

 {
 public:
 {
 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 );

     
     

-    void SetWidth( int width ) { m_width = width; }
-    int GetWidth() { return m_width; }
+    virtual void SetAlignment( wxAlignment align );

     
     

+    virtual void SetSortable( bool sortable );
+    virtual bool GetSortable();
+    virtual void SetSortOrder( bool ascending );
+    virtual bool IsSortOrderAscending();
+
+    virtual int GetWidth();
+

 private:
 private:

-    int     m_width;
+    int                      m_width;
+    int                      m_fixedWidth;

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

-// --------------------------------------------------------- 
+// ---------------------------------------------------------

 // wxDataViewCtrl
 // wxDataViewCtrl

-// --------------------------------------------------------- 
+// ---------------------------------------------------------

 
 

-class WXDLLIMPEXP_CORE wxDataViewCtrl: public wxDataViewCtrlBase, 
+class WXDLLIMPEXP_ADV wxDataViewCtrl: public wxDataViewCtrlBase,

                                        public wxScrollHelperNative
 {
 public:
                                        public wxScrollHelperNative
 {
 public:


@@ -204,11 +252,11 @@ public:
     {
         Init();
     }
     {
         Init();
     }

-    
+

     wxDataViewCtrl( wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
     wxDataViewCtrl( wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,

-           const wxValidator& validator = wxDefaultValidator ) 
+           const wxValidator& validator = wxDefaultValidator )

              : wxScrollHelperNative(this)
     {
         Create(parent, id, pos, size, style, validator );
              : wxScrollHelperNative(this)
     {
         Create(parent, id, pos, size, style, validator );


@@ -225,17 +273,26 @@ 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;
     wxDataViewListModelNotifier *m_notifier;
     wxDataViewMainWindow        *m_clientArea;
     wxDataViewHeaderWindow      *m_headerArea;
 private:
     friend class wxDataViewMainWindow;
     friend class wxDataViewHeaderWindow;
     wxDataViewListModelNotifier *m_notifier;
     wxDataViewMainWindow        *m_clientArea;
     wxDataViewHeaderWindow      *m_headerArea;

-    
+

 private:
     void OnSize( wxSizeEvent &event );
 private:
     void OnSize( wxSizeEvent &event );

-    
+

     // we need to return a special WM_GETDLGCODE value to process just the
     // arrows but let the other navigation characters through
 #ifdef __WXMSW__
     // we need to return a special WM_GETDLGCODE value to process just the
     // arrows but let the other navigation characters through
 #ifdef __WXMSW__