emulate scrolling in wxMSW header control; document the need to call ScrollWindow...

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

diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h
index 6b14e807a3004711f62a4a595f2540b9fd6a5e32..adabdd7e40c0db4fe6f52f03d41f2882c2cab92e 100644 (file)
--- a/include/wx/generic/dataview.h
+++ b/include/wx/generic/dataview.h
@@ -299,12 +299,8 @@ protected:
 // wxDataViewColumn
 // ---------------------------------------------------------
 
-class WXDLLIMPEXP_ADV wxDataViewColumn: public wxDataViewColumnBase
+class WXDLLIMPEXP_ADV wxDataViewColumn : public wxDataViewColumnBase
 {
-    friend class wxDataViewHeaderWindowBase;
-    friend class wxDataViewHeaderWindow;
-    friend class wxDataViewHeaderWindowMSW;
-
 public:
     wxDataViewColumn( const wxString &title, wxDataViewRenderer *renderer, 
                       unsigned int model_column, int width = wxDVC_DEFAULT_WIDTH, 
@@ -314,59 +310,25 @@ public:
                       unsigned int model_column, int width = wxDVC_DEFAULT_WIDTH, 
                       wxAlignment align = wxALIGN_CENTER,
                       int flags = wxDATAVIEW_COL_RESIZABLE );
-    virtual ~wxDataViewColumn();
-
-    // setters:
-
-    virtual void SetTitle( const wxString &title )
-        { m_title=title; }
-    virtual void SetAlignment( wxAlignment align )
-        { m_align=align; }
-    virtual void SetMinWidth( int minWidth )
-        { m_minWidth=minWidth; }
-    virtual void SetWidth( int width );
-    virtual void SetSortable( bool sortable );
-    virtual void SetResizeable( bool resizeable );
-    virtual void SetHidden( bool hidden );
-    virtual void SetSortOrder( bool ascending );
-    virtual void SetReorderable( bool reorderable );
-
-    // getters:
-
-    virtual wxString GetTitle() const
-        { return m_title; }
-    virtual wxAlignment GetAlignment() const
-        { return m_align; }
-    virtual int GetWidth() const
-        { return m_width; }
-    virtual int GetMinWidth() const
-        { return m_minWidth; }
-    virtual bool IsSortable() const
-        { return (m_flags & wxDATAVIEW_COL_SORTABLE) != 0; }
-    virtual bool IsResizeable() const
-        { return (m_flags & wxDATAVIEW_COL_RESIZABLE) != 0; }
-    virtual bool IsHidden() const
-        { return (m_flags & wxDATAVIEW_COL_HIDDEN) != 0; }
-    virtual bool IsSortOrderAscending() const;
-    virtual bool IsReorderable() const
-        { return (m_flags & wxDATAVIEW_COL_REORDERABLE) != 0; }
 
-private:
-    int                      m_width;
-    int                      m_minWidth;
-    int                      m_flags;
-    wxAlignment              m_align;
-    wxString                 m_title;
-    bool                     m_ascending;
-    bool                     m_autosize;
+    // override some methods to notify the owner about changes
+    virtual void SetFlags(int flags);
+    virtual void SetWidth(int width);
+    virtual void SetSortOrder(bool ascending);
 
-    void Init(int width);
+    // override this one to return our default width for columns whose width
+    // was not explicitly set
+    virtual int GetWidth() const;
 
+private:
     // like SetWidth() but does not ask the header window of the
     // wxDataViewCtrl to reflect the width-change.
     void SetInternalWidth(int width);
 
-protected:
+    friend class wxDataViewHeaderWindowBase;
+    friend class wxDataViewHeaderWindow;
+    friend class wxDataViewHeaderWindowMSW;
+
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewColumn)
 };
 
@@ -389,8 +351,6 @@ class WXDLLIMPEXP_ADV wxDataViewCtrl: public wxDataViewCtrlBase,
 public:
     wxDataViewCtrl() : wxScrollHelperNative(this)
     {
-        //No sorting column at start, I think
-        m_sortingColumn = NULL;
         Init();
     }
 
@@ -400,7 +360,6 @@ public:
            const wxValidator& validator = wxDefaultValidator )
              : wxScrollHelperNative(this)
     {
-        m_sortingColumn = NULL;
         Create(parent, id, pos, size, style, validator );
     }
 
@@ -414,8 +373,10 @@ public:
            const wxValidator& validator = wxDefaultValidator );
 
     virtual bool AssociateModel( wxDataViewModel *model );
+    
     virtual bool AppendColumn( wxDataViewColumn *col );
     virtual bool PrependColumn( wxDataViewColumn *col );
+    virtual bool InsertColumn( unsigned int pos, wxDataViewColumn *col );
 
     virtual void DoSetExpanderColumn();
     virtual void DoSetIndent();
@@ -445,6 +406,8 @@ public:
 
     virtual void Expand( const wxDataViewItem & item );
     virtual void Collapse( const wxDataViewItem & item );
+    
+    virtual void SetFocus();
 
 protected:
     virtual int GetSelections( wxArrayInt & sel ) const; 
@@ -488,6 +451,7 @@ private:
 
 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