Compilation fixes for old SDKs (VC6) after recent commit.

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

diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h
index 18a6bb0123cd33e3b2b01668e720a2e486a8048a..a0e1cf369ced65d91e042fdbcfb59e15566f33ba 100644 (file)
--- a/include/wx/generic/dataview.h
+++ b/include/wx/generic/dataview.h
@@ -2,6 +2,7 @@
 // Name:        wx/generic/dataview.h
 // Purpose:     wxDataViewCtrl generic implementation header
 // Author:      Robert Roebling
 // Name:        wx/generic/dataview.h
 // Purpose:     wxDataViewCtrl generic implementation header
 // Author:      Robert Roebling

+// Modified By: Bo Yang

 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence


@@ -17,266 +18,231 @@
 #include "wx/scrolwin.h"
 #include "wx/icon.h"
 
 #include "wx/scrolwin.h"
 #include "wx/icon.h"
 

-// ---------------------------------------------------------
-// classes
-// ---------------------------------------------------------
-
-class WXDLLIMPEXP_ADV wxDataViewCtrl;
-class WXDLLIMPEXP_ADV wxDataViewMainWindow;
-class WXDLLIMPEXP_ADV wxDataViewHeaderWindow;
-
-// ---------------------------------------------------------
-// wxDataViewCell
-// ---------------------------------------------------------
-
-class WXDLLIMPEXP_ADV wxDataViewCell: public wxDataViewCellBase
-{
-public:
-    wxDataViewCell( const wxString &varianttype, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
-    virtual ~wxDataViewCell();
-
-    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) )
-                           { return false; }
-
-    virtual bool LeftClick( wxPoint WXUNUSED(cursor),
-                            wxRect WXUNUSED(cell),
-                            wxDataViewListModel *WXUNUSED(model),
-                            size_t WXUNUSED(col),
-                            size_t WXUNUSED(row) )
-                            { return false; }
-    virtual bool RightClick( wxPoint WXUNUSED(cursor),
-                             wxRect WXUNUSED(cell),
-                             wxDataViewListModel *WXUNUSED(model),
-                             size_t WXUNUSED(col),
-                             size_t WXUNUSED(row) )
-                             { return false; }
-    virtual bool StartDrag( wxPoint WXUNUSED(cursor),
-                            wxRect WXUNUSED(cell),
-                            wxDataViewListModel *WXUNUSED(model),
-                            size_t WXUNUSED(col),
-                            size_t WXUNUSED(row) )
-                            { return false; }
-
-    // Create DC on request
-    virtual wxDC *GetDC();
-
-private:
-    wxDC        *m_dc;
-
-protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCell)
-};
+class WXDLLIMPEXP_FWD_ADV wxDataViewMainWindow;
+class WXDLLIMPEXP_FWD_ADV wxDataViewHeaderWindow;

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

-// wxDataViewCustomCell
+// wxDataViewColumn

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

-class WXDLLIMPEXP_ADV wxDataViewCustomCell: public wxDataViewCell
+class WXDLLIMPEXP_ADV wxDataViewColumn : public wxDataViewColumnBase

 {
 public:
 {
 public:

-    wxDataViewCustomCell( const wxString &varianttype = wxT("string"),
-                          wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
-
-protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomCell)
-};
+    wxDataViewColumn(const wxString& title,
+                     wxDataViewRenderer *renderer,
+                     unsigned int model_column,
+                     int width = wxDVC_DEFAULT_WIDTH,
+                     wxAlignment align = wxALIGN_CENTER,
+                     int flags = wxDATAVIEW_COL_RESIZABLE)
+        : wxDataViewColumnBase(renderer, model_column),
+          m_title(title)
+    {
+        Init(width, align, flags);
+    }

 
 

-// ---------------------------------------------------------
-// wxDataViewTextCell
-// ---------------------------------------------------------
+    wxDataViewColumn(const wxBitmap& bitmap,
+                     wxDataViewRenderer *renderer,
+                     unsigned int model_column,
+                     int width = wxDVC_DEFAULT_WIDTH,
+                     wxAlignment align = wxALIGN_CENTER,
+                     int flags = wxDATAVIEW_COL_RESIZABLE)
+        : wxDataViewColumnBase(bitmap, renderer, model_column)
+    {
+        Init(width, align, flags);
+    }

 
 

-class WXDLLIMPEXP_ADV wxDataViewTextCell: public wxDataViewCustomCell
-{
-public:
-    wxDataViewTextCell( const wxString &varianttype = wxT("string"),
-                        wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
+    // implement wxHeaderColumnBase methods
+    virtual void SetTitle(const wxString& title) { m_title = title; UpdateDisplay(); }
+    virtual wxString GetTitle() const { return m_title; }

 
 

-    bool SetValue( const wxVariant &value );
-    bool GetValue( wxVariant &value );
+    virtual void SetWidth(int width) { m_width = width; UpdateDisplay(); }
+    virtual int GetWidth() const { return m_width; }

 
 

-    bool Render( wxRect cell, wxDC *dc, int state );
-    wxSize GetSize();
+    virtual void SetMinWidth(int minWidth) { m_minWidth = minWidth; UpdateDisplay(); }
+    virtual int GetMinWidth() const { return m_minWidth; }

 
 

-private:
-    wxString m_text;
+    virtual void SetAlignment(wxAlignment align) { m_align = align; UpdateDisplay(); }
+    virtual wxAlignment GetAlignment() const { return m_align; }

 
 

-protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextCell)
-};
+    virtual void SetFlags(int flags) { m_flags = flags; UpdateDisplay(); }
+    virtual int GetFlags() const { return m_flags; }

 
 

-// ---------------------------------------------------------
-// wxDataViewBitmapCell
-// ---------------------------------------------------------
+    virtual void SetAsSortKey(bool sort = true) { m_sort = sort; UpdateDisplay(); }
+    virtual bool IsSortKey() const { return m_sort; }

 
 

-class WXDLLIMPEXP_ADV wxDataViewBitmapCell: public wxDataViewCustomCell
-{
-public:
-    wxDataViewBitmapCell( const wxString &varianttype = wxT("wxBitmap"),
-                        wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
+    virtual void SetSortOrder(bool ascending) { m_sortAscending = ascending; UpdateDisplay(); }
+    virtual bool IsSortOrderAscending() const { return m_sortAscending; }

 
 

-    bool SetValue( const wxVariant &value );
-    bool GetValue( wxVariant &value );
+    virtual void SetBitmap( const wxBitmap& bitmap ) { wxDataViewColumnBase::SetBitmap(bitmap); UpdateDisplay(); }

 
 

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

 
 private:
 
 private:

-    wxIcon m_icon;
-    wxBitmap m_bitmap;
+    // common part of all ctors
+    void Init(int width, wxAlignment align, int flags);
+    
+    void UpdateDisplay();

 
 

-protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapCell)
+    wxString m_title;
+    int m_width,
+        m_minWidth;
+    wxAlignment m_align;
+    int m_flags;
+    bool m_sort,
+         m_sortAscending;
+
+    friend class wxDataViewHeaderWindowBase;
+    friend class wxDataViewHeaderWindow;
+    friend class wxDataViewHeaderWindowMSW;

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

-// wxDataViewToggleCell
+// wxDataViewCtrl

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

-class WXDLLIMPEXP_ADV wxDataViewToggleCell: public wxDataViewCustomCell
+WX_DECLARE_LIST_WITH_DECL(wxDataViewColumn, wxDataViewColumnList,
+                          class WXDLLIMPEXP_ADV);
+
+class WXDLLIMPEXP_ADV wxDataViewCtrl : public wxDataViewCtrlBase,
+                                       public wxScrollHelper

 {
 {

-public:
-    wxDataViewToggleCell( const wxString &varianttype = wxT("bool"),
-                        wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
+    friend class wxDataViewMainWindow;
+    friend class wxDataViewHeaderWindowBase;
+    friend class wxDataViewHeaderWindow;
+    friend class wxDataViewHeaderWindowMSW;
+    friend class wxDataViewColumn;

 
 

-    bool SetValue( const wxVariant &value );
-    bool GetValue( wxVariant &value );
+public:
+    wxDataViewCtrl() : wxScrollHelper(this)
+    {
+        Init();
+    }

 
 

-    bool Render( wxRect cell, wxDC *dc, int state );
-    bool Activate( wxRect cell, wxDataViewListModel *model, size_t col, size_t row );
-    wxSize GetSize();
+    wxDataViewCtrl( wxWindow *parent, wxWindowID id,
+           const wxPoint& pos = wxDefaultPosition,
+           const wxSize& size = wxDefaultSize, long style = 0,
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxDataViewCtrlNameStr )
+             : wxScrollHelper(this)
+    {
+        Create(parent, id, pos, size, style, validator, name);
+    }

 
 

-private:
-    bool    m_toggle;
+    virtual ~wxDataViewCtrl();

 
 

-protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleCell)
-};
+    void Init();

 
 

-// ---------------------------------------------------------
-// wxDataViewProgressCell
-// ---------------------------------------------------------
+    bool Create(wxWindow *parent, wxWindowID id,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize, long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxDataViewCtrlNameStr);

 
 

-class WXDLLIMPEXP_ADV wxDataViewProgressCell: public wxDataViewCustomCell
-{
-public:
-    wxDataViewProgressCell( const wxString &label = wxEmptyString,
-                            const wxString &varianttype = wxT("long"),
-                            wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
-    virtual ~wxDataViewProgressCell();
+    virtual bool AssociateModel( wxDataViewModel *model );

 
 

-    bool SetValue( const wxVariant &value );
+    virtual bool AppendColumn( wxDataViewColumn *col );
+    virtual bool PrependColumn( wxDataViewColumn *col );
+    virtual bool InsertColumn( unsigned int pos, wxDataViewColumn *col );

 
 

-    virtual bool Render( wxRect cell, wxDC *dc, int state );
-    virtual wxSize GetSize();
+    virtual void DoSetExpanderColumn();
+    virtual void DoSetIndent();

 
 

-private:
-    wxString    m_label;
-    int         m_value;
+    virtual unsigned int GetColumnCount() const;
+    virtual wxDataViewColumn* GetColumn( unsigned int pos ) const;
+    virtual bool DeleteColumn( wxDataViewColumn *column );
+    virtual bool ClearColumns();
+    virtual int GetColumnPosition( const wxDataViewColumn *column ) const;

 
 

-protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressCell)
-};
+    virtual wxDataViewColumn *GetSortingColumn() const;

 
 

-// ---------------------------------------------------------
-// wxDataViewDateCell
-// ---------------------------------------------------------
+    virtual wxDataViewItem GetSelection() const;
+    virtual int GetSelections( wxDataViewItemArray & sel ) const;
+    virtual void SetSelections( const wxDataViewItemArray & sel );
+    virtual void Select( const wxDataViewItem & item );
+    virtual void Unselect( const wxDataViewItem & item );
+    virtual bool IsSelected( const wxDataViewItem & item ) const;

 
 

-class WXDLLIMPEXP_ADV wxDataViewDateCell: public wxDataViewCustomCell
-{
-public:
-    wxDataViewDateCell( const wxString &varianttype = wxT("datetime"),
-                        wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE );
+    virtual void SelectAll();
+    virtual void UnselectAll();

 
 

-    bool SetValue( const wxVariant &value );
+    virtual void EnsureVisible( const wxDataViewItem & item,
+                                const wxDataViewColumn *column = NULL );
+    virtual void HitTest( const wxPoint & point, wxDataViewItem & item,
+                          wxDataViewColumn* &column ) const;
+    virtual wxRect GetItemRect( const wxDataViewItem & item,
+                                const wxDataViewColumn *column = NULL ) const;

 
 

-    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 );
+    virtual void Expand( const wxDataViewItem & item );
+    virtual void Collapse( const wxDataViewItem & item );
+    virtual bool IsExpanded( const wxDataViewItem & item ) const;

 
 

-private:
-    wxDateTime    m_date;
+    virtual void SetFocus();

 
 

-protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateCell)
-};
+#if wxUSE_DRAG_AND_DROP
+    virtual bool EnableDragSource( const wxDataFormat &format );
+    virtual bool EnableDropTarget( const wxDataFormat &format );
+#endif // wxUSE_DRAG_AND_DROP

 
 

-// ---------------------------------------------------------
-// wxDataViewColumn
-// ---------------------------------------------------------
+    virtual wxBorder GetDefaultBorder() const;

 
 

-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 );
-    virtual ~wxDataViewColumn();
+    void StartEditor( const wxDataViewItem & item, unsigned int column );

 
 

-    virtual void SetTitle( const wxString &title );
+protected:
+    virtual int GetSelections( wxArrayInt & sel ) const;
+    virtual void SetSelections( const wxArrayInt & sel );
+    virtual void Select( int row );
+    virtual void Unselect( int row );
+    virtual bool IsSelected( int row ) const;
+    virtual void SelectRange( int from, int to );
+    virtual void UnselectRange( int from, int to );

 
 

-    virtual int GetWidth();
+    virtual void EnsureVisible( int row, int column );

 
 

-    virtual void SetFixedWidth( int width );
-    virtual int GetFixedWidth();
-    
-private:
-    int                      m_width;
-    wxDataViewColumnSizing   m_sizing;
-    int                      m_fixedWidth;
+    virtual wxDataViewItem GetItemByRow( unsigned int row ) const;
+    virtual int GetRowByItem( const wxDataViewItem & item ) const;

 
 

-protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewColumn)
-};
+    int GetSortingColumnIndex() const { return m_sortingColumnIdx; }
+    void SetSortingColumnIndex(int idx) { m_sortingColumnIdx = idx; }

 
 

-// ---------------------------------------------------------
-// wxDataViewCtrl
-// ---------------------------------------------------------
+public:     // utility functions not part of the API

 
 

-class WXDLLIMPEXP_ADV wxDataViewCtrl: public wxDataViewCtrlBase,
-                                       public wxScrollHelperNative
-{
-public:
-    wxDataViewCtrl() : wxScrollHelperNative(this)
+    // returns the "best" width for the idx-th column
+    unsigned int GetBestColumnWidth(int WXUNUSED(idx)) const

     {
     {

-        Init();
+        return GetClientSize().GetWidth() / GetColumnCount();

     }
 
     }
 

-    wxDataViewCtrl( wxWindow *parent, wxWindowID id,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-           const wxValidator& validator = wxDefaultValidator )
-             : wxScrollHelperNative(this)
-    {
-        Create(parent, id, pos, size, style, validator );
-    }
+    // called by header window after reorder
+    void ColumnMoved( wxDataViewColumn* col, unsigned int new_pos );

 
 

-    virtual ~wxDataViewCtrl();
+    // update the display after a change to an individual column
+    void OnColumnChange(unsigned int idx);

 
 

-    void Init();
+    // update after a change to the number of columns
+    void OnColumnsCountChanged();

 
 

-    bool Create(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-           const wxValidator& validator = wxDefaultValidator );
+    wxWindow *GetMainWindow() { return (wxWindow*) m_clientArea; }

 
 

-    virtual bool AssociateModel( wxDataViewListModel *model );
-    virtual bool AppendColumn( wxDataViewColumn *col );
+    // return the index of the given column in m_cols
+    int GetColumnIndex(const wxDataViewColumn *column) const;
+
+    // return the column displayed at the given position in the control
+    wxDataViewColumn *GetColumnAt(unsigned int pos) const;

 
 private:
 
 private:

-    friend class wxDataViewMainWindow;
-    friend class wxDataViewHeaderWindow;
-    wxDataViewListModelNotifier *m_notifier;
-    wxDataViewMainWindow        *m_clientArea;
-    wxDataViewHeaderWindow      *m_headerArea;
+    virtual wxDataViewItem DoGetCurrentItem() const;
+    virtual void DoSetCurrentItem(const wxDataViewItem& item);
+
+    wxDataViewColumnList      m_cols;
+    wxDataViewModelNotifier  *m_notifier;
+    wxDataViewMainWindow     *m_clientArea;
+    wxDataViewHeaderWindow   *m_headerArea;
+
+    // the index of the column currently used for sorting or -1
+    int m_sortingColumnIdx;

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

+    virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size);

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


@@ -288,7 +254,7 @@ private:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)

-    DECLARE_NO_COPY_CLASS(wxDataViewCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxDataViewCtrl);

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };