diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h
index e575a4f2c0..19b4b2d6f0 100644
--- a/include/wx/gtk/dataview.h
+++ b/include/wx/gtk/dataview.h
@@ -15,15 +15,15 @@
 #include "wx/list.h"
 #include "wx/control.h"
 
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
 // classes
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
 
 class WXDLLIMPEXP_CORE wxDataViewCtrl;
 
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
 // wxDataViewRenderer
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
 
 class wxDataViewRenderer: public wxDataViewRendererBase
 {
@@ -40,150 +40,150 @@ protected:
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer)
 };
-    
-// --------------------------------------------------------- 
+
+// ---------------------------------------------------------
 // wxDataViewTextRenderer
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
 
 class wxDataViewTextRenderer: public wxDataViewRenderer
 {
 public:
-    wxDataViewTextRenderer( const wxString &varianttype = wxT("string"), 
+    wxDataViewTextRenderer( const wxString &varianttype = wxT("string"),
                         wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
 
     bool SetValue( const wxVariant &value );
     bool GetValue( wxVariant &value );
-    
+
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer)
 };
-    
-// --------------------------------------------------------- 
+
+// ---------------------------------------------------------
 // wxDataViewBitmapRenderer
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
 
 class wxDataViewBitmapRenderer: public wxDataViewRenderer
 {
 public:
-    wxDataViewBitmapRenderer( const wxString &varianttype = wxT("wxBitmap"), 
+    wxDataViewBitmapRenderer( const wxString &varianttype = wxT("wxBitmap"),
                               wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
 
     bool SetValue( const wxVariant &value );
     bool GetValue( wxVariant &value );
-    
+
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer)
 };
-    
-// --------------------------------------------------------- 
+
+// ---------------------------------------------------------
 // wxDataViewToggleRenderer
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
 
 class wxDataViewToggleRenderer: public wxDataViewRenderer
 {
 public:
-    wxDataViewToggleRenderer( const wxString &varianttype = wxT("bool"), 
+    wxDataViewToggleRenderer( const wxString &varianttype = wxT("bool"),
                         wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
 
     bool SetValue( const wxVariant &value );
     bool GetValue( wxVariant &value );
-    
+
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer)
 };
-    
-// --------------------------------------------------------- 
+
+// ---------------------------------------------------------
 // wxDataViewCustomRenderer
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
 
 class wxDataViewCustomRenderer: public wxDataViewRenderer
 {
 public:
-    wxDataViewCustomRenderer( const wxString &varianttype = wxT("string"), 
+    wxDataViewCustomRenderer( const wxString &varianttype = wxT("string"),
                               wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
                               bool no_init = false );
     virtual ~wxDataViewCustomRenderer();
     bool Init();
-    
+
     virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0;
     virtual wxSize GetSize() = 0;
-    
+
     virtual bool Activate( wxRect cell,
-                           wxDataViewListModel *model, unsigned int col, unsigned int row )   
+                           wxDataViewListModel * WXUNUSED(model), unsigned int WXUNUSED(col), unsigned int WXUNUSED(row) )
                            { return false; }
-    
-    virtual bool LeftClick( wxPoint cursor, wxRect cell, 
-                           wxDataViewListModel *model, unsigned int col, unsigned int row )   
+
+    virtual bool LeftClick( wxPoint WXUNUSED(cursor), wxRect WXUNUSED(cell),
+                           wxDataViewListModel* WXUNUSED(model), unsigned int WXUNUSED(col), unsigned int WXUNUSED(row) )
                            { return false; }
-    virtual bool RightClick( wxPoint cursor, wxRect cell,
-                           wxDataViewListModel *model, unsigned int col, unsigned int row )   
+    virtual bool RightClick( wxPoint WXUNUSED(cursor), wxRect WXUNUSED(cell),
+                           wxDataViewListModel* WXUNUSED(model), unsigned int WXUNUSED(col), unsigned int WXUNUSED(row) )
                            { return false; }
-    virtual bool StartDrag( wxPoint cursor, wxRect cell, 
-                           wxDataViewListModel *model, unsigned int col, unsigned int row )   
+    virtual bool StartDrag( wxPoint cursor, wxRect cell,
+                           wxDataViewListModel* WXUNUSED(model), unsigned int WXUNUSED(col), unsigned int WXUNUSED(row) )
                            { return false; }
-    
+
     // Create DC on request
     virtual wxDC *GetDC();
-    
+
 private:
     wxDC        *m_dc;
-    
+
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer)
 };
-    
-// --------------------------------------------------------- 
+
+// ---------------------------------------------------------
 // wxDataViewProgressRenderer
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
 
 class wxDataViewProgressRenderer: public wxDataViewCustomRenderer
 {
 public:
-    wxDataViewProgressRenderer( const wxString &label = wxEmptyString, 
-                                const wxString &varianttype = wxT("long"), 
+    wxDataViewProgressRenderer( const wxString &label = wxEmptyString,
+                                const wxString &varianttype = wxT("long"),
                                 wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
     virtual ~wxDataViewProgressRenderer();
-    
+
     bool SetValue( const wxVariant &value );
-    
+
     virtual bool Render( wxRect cell, wxDC *dc, int state );
     virtual wxSize GetSize();
-    
+
 private:
     wxString    m_label;
     int         m_value;
-    
+
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer)
 };
-    
-// --------------------------------------------------------- 
+
+// ---------------------------------------------------------
 // wxDataViewDateRenderer
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
 
 class wxDataViewDateRenderer: public wxDataViewCustomRenderer
 {
 public:
-    wxDataViewDateRenderer( const wxString &varianttype = wxT("datetime"), 
+    wxDataViewDateRenderer( const wxString &varianttype = wxT("datetime"),
                         wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE );
-    
+
     bool SetValue( const wxVariant &value );
-    
+
     virtual bool Render( wxRect cell, wxDC *dc, int state );
     virtual wxSize GetSize();
     virtual bool Activate( wxRect cell,
                            wxDataViewListModel *model, unsigned int col, unsigned int row );
-    
+
 private:
     wxDateTime    m_date;
-    
+
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateRenderer)
 };
-    
-// --------------------------------------------------------- 
+
+// ---------------------------------------------------------
 // wxDataViewColumn
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
 
 class WXDLLIMPEXP_CORE wxDataViewColumn: public wxDataViewColumnBase
 {
@@ -200,45 +200,45 @@ public:
     virtual void SetOwner( wxDataViewCtrl *owner );
 
     virtual void SetAlignment( wxAlignment align );
-    
+
     virtual void SetSortable( bool sortable );
     virtual bool GetSortable();
     virtual void SetSortOrder( bool ascending );
     virtual bool IsSortOrderAscending();
 
     virtual int GetWidth();
-    
+
     virtual void SetFixedWidth( int width );
     virtual int GetFixedWidth();
-    
+
     // implementation
     void* GetGtkHandle() { return m_column; }
 
 private:
     // holds the GTK handle
     void*   m_column;
-    
+
     // delayed connection to mouse events
     friend class wxDataViewCtrl;
     void OnInternalIdle();
-    bool    m_isConnected;  
-    
+    bool    m_isConnected;
+
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewColumn)
 };
 
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
 // wxDataViewCtrl
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
 
 class WXDLLIMPEXP_CORE wxDataViewCtrl: public wxDataViewCtrlBase
 {
 public:
-    wxDataViewCtrl() 
+    wxDataViewCtrl()
     {
         Init();
     }
-    
+
     wxDataViewCtrl( wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
@@ -258,28 +258,28 @@ public:
 
     virtual bool AssociateModel( wxDataViewListModel *model );
     virtual bool AppendColumn( wxDataViewColumn *col );
-    
+
     virtual void SetSelection( int row ); // -1 for unselect
     virtual void SetSelectionRange( unsigned int from, unsigned int to );
     virtual void SetSelections( const wxArrayInt& aSelections);
     virtual void Unselect( unsigned int row );
-    
+
     virtual bool IsSelected( unsigned int row ) const;
     virtual int GetSelection() const;
     virtual int GetSelections(wxArrayInt& aSelections) const;
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-    
+
 private:
     friend class wxDataViewCtrlDC;
     friend class wxDataViewColumn;
     friend class wxGtkDataViewListModelNotifier;
     GtkWidget                   *m_treeview;
     wxDataViewListModelNotifier *m_notifier;
-    
+
     virtual void OnInternalIdle();
-    
+
 private:
     DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)
     DECLARE_NO_COPY_CLASS(wxDataViewCtrl)