disable report view mode under Mac as it hangs the native wxListCtrl implementation...

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

diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h
index 10e8bbf97044847de2fd922344695015d3a004f5..f3c6057cbae39742a085d0e770bfbca8d784ac90 100644 (file)
--- a/include/wx/generic/dataview.h
+++ b/include/wx/generic/dataview.h
@@ -41,10 +41,8 @@ public:
     virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0;
     virtual wxSize GetSize() const = 0;
 
     virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0;
     virtual wxSize GetSize() const = 0;
 

-    virtual void SetAlignment( int align )
-        { m_align=align; }
-    virtual int GetAlignment() const
-        { return m_align; }
+    virtual void SetAlignment( int align );
+    virtual int GetAlignment() const;

 
     virtual void SetMode( wxDataViewCellMode mode )
         { m_mode=mode; }
 
     virtual void SetMode( wxDataViewCellMode mode )
         { m_mode=mode; }


@@ -83,6 +81,9 @@ public:
     void SetAttr( const wxDataViewItemAttr &attr ) { m_attr = attr; }
     bool GetWantsAttr() { return m_wantsAttr; }
 
     void SetAttr( const wxDataViewItemAttr &attr ) { m_attr = attr; }
     bool GetWantsAttr() { return m_wantsAttr; }
 

+    // implementation
+    int CalculateAlignment() const;
+

 private:
     wxDC                        *m_dc;
     int                          m_align;
 private:
     wxDC                        *m_dc;
     int                          m_align;


@@ -243,7 +244,7 @@ protected:
 // wxDataViewIconTextRenderer
 // --------------------------------------------------------- 
 
 // wxDataViewIconTextRenderer
 // --------------------------------------------------------- 
 

-class wxDataViewIconTextRenderer: public wxDataViewCustomRenderer
+class WXDLLIMPEXP_ADV wxDataViewIconTextRenderer: public wxDataViewCustomRenderer

 {
 public:
     wxDataViewIconTextRenderer( const wxString &varianttype = wxT("wxDataViewIconText"), 
 {
 public:
     wxDataViewIconTextRenderer( const wxString &varianttype = wxT("wxDataViewIconText"), 


@@ -328,7 +329,7 @@ public:
     virtual void SetResizeable( bool resizeable );
     virtual void SetHidden( bool hidden );
     virtual void SetSortOrder( bool ascending );
     virtual void SetResizeable( bool resizeable );
     virtual void SetHidden( bool hidden );
     virtual void SetSortOrder( bool ascending );

-
+    virtual void SetReorderable( bool reorderable );

 
     // getters:
 
 
     // getters:
 


@@ -347,7 +348,8 @@ public:
     virtual bool IsHidden() const
         { return (m_flags & wxDATAVIEW_COL_HIDDEN) != 0; }
     virtual bool IsSortOrderAscending() const;
     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;
 
 private:
     int                      m_width;


@@ -356,6 +358,7 @@ private:
     wxAlignment              m_align;
     wxString                 m_title;
     bool                     m_ascending;
     wxAlignment              m_align;
     wxString                 m_title;
     bool                     m_ascending;

+    bool                     m_autosize;

 
     void Init(int width);
 
 
     void Init(int width);
 


@@ -411,8 +414,10 @@ public:
            const wxValidator& validator = wxDefaultValidator );
 
     virtual bool AssociateModel( wxDataViewModel *model );
            const wxValidator& validator = wxDefaultValidator );
 
     virtual bool AssociateModel( wxDataViewModel *model );

+    

     virtual bool AppendColumn( wxDataViewColumn *col );
     virtual bool PrependColumn( wxDataViewColumn *col );
     virtual bool AppendColumn( wxDataViewColumn *col );
     virtual bool PrependColumn( wxDataViewColumn *col );

+    virtual bool InsertColumn( unsigned int pos, wxDataViewColumn *col );

 
     virtual void DoSetExpanderColumn();
     virtual void DoSetIndent();
 
     virtual void DoSetExpanderColumn();
     virtual void DoSetIndent();


@@ -468,17 +473,20 @@ public:     // utility functions not part of the API
         return GetClientSize().GetWidth() / GetColumnCount();
     }
 
         return GetClientSize().GetWidth() / GetColumnCount();
     }
 

+    // called by header window after reorder
+    void ColumnMoved( wxDataViewColumn* col, unsigned int new_pos );
+

     // updates the header window after a change in a column setting
     void OnColumnChange();
 
     wxWindow *GetMainWindow() { return (wxWindow*) m_clientArea; }
 
 private:
     // updates the header window after a change in a column setting
     void OnColumnChange();
 
     wxWindow *GetMainWindow() { return (wxWindow*) m_clientArea; }
 
 private:

-    wxDataViewColumnList m_cols;
-    wxDataViewModelNotifier *m_notifier;
-    wxDataViewMainWindow        *m_clientArea;
-    wxDataViewHeaderWindow      *m_headerArea;
-    wxDataViewColumn* m_sortingColumn;
+    wxDataViewColumnList      m_cols;
+    wxDataViewModelNotifier  *m_notifier;
+    wxDataViewMainWindow     *m_clientArea;
+    wxDataViewHeaderWindow   *m_headerArea;
+    wxDataViewColumn         *m_sortingColumn;

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