fix some warnings from GCC -Wextra

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

diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h
index 7bf0e396d8e5366d1a3fe6dc39e902660a6d15fe..6b14e807a3004711f62a4a595f2540b9fd6a5e32 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 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; }
@@ -83,6 +81,9 @@ public:
     void SetAttr( const wxDataViewItemAttr &attr ) { m_attr = attr; }
     bool GetWantsAttr() { return m_wantsAttr; }
 
+    // implementation
+    int CalculateAlignment() const;
+
 private:
     wxDC                        *m_dc;
     int                          m_align;
@@ -243,7 +244,7 @@ protected:
 // wxDataViewIconTextRenderer
 // --------------------------------------------------------- 
 
-class wxDataViewIconTextRenderer: public wxDataViewCustomRenderer
+class WXDLLIMPEXP_ADV wxDataViewIconTextRenderer: public wxDataViewCustomRenderer
 {
 public:
     wxDataViewIconTextRenderer( const wxString &varianttype = wxT("wxDataViewIconText"), 
@@ -357,6 +358,7 @@ private:
     wxAlignment              m_align;
     wxString                 m_title;
     bool                     m_ascending;
+    bool                     m_autosize;
 
     void Init(int width);
 
@@ -469,17 +471,20 @@ public:     // utility functions not part of the API
         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:
-    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 );