Merge branch 'dvc-type-check'

Various fixes to make wxDataViewCtrl behaviour more homogeneous across all
ports.

include/wx/osx/dvrenderer.h

@@ -83,12 +83,9 @@ public:
                                   const wxDataViewItem& item,
                                   unsigned col);
 
-    // called to ensure that the given attribute will be used for rendering the
-    // next cell (which had been already associated with this renderer before)
-    virtual void OSXApplyAttr(const wxDataViewItemAttr& attr);
-
-    // called to set the state of the next cell to be rendered
-    virtual void OSXApplyEnabled(bool enabled);
+protected:
+    virtual void SetAttr(const wxDataViewItemAttr& attr) wxOVERRIDE;
+    virtual void SetEnabled(bool enabled) wxOVERRIDE;
 #endif // Cocoa
 
 private:

include/wx/osx/dvrenderers.h

@@ -31,10 +31,6 @@ public:
 
     virtual bool MacRender();
 
-#if wxOSX_USE_COCOA
-    virtual void OSXApplyAttr(const wxDataViewItemAttr& attr);
-#endif // Cocoa
-
     virtual wxDC* GetDC(); // creates a device context and keeps it
     void SetDC(wxDC* newDCPtr); // this method takes ownership of the pointer