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 eecad6d6eb83b17c3d64a758fdaab52ebe4ce37b..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"), 


@@ -413,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();