diff --git a/include/wx/generic/grideditors.h b/include/wx/generic/grideditors.h
index 0abe429f88..6e53a89dd7 100644
--- a/include/wx/generic/grideditors.h
+++ b/include/wx/generic/grideditors.h
@@ -307,10 +307,6 @@ public:
 
     virtual void SetSize(const wxRect& rect) wxOVERRIDE;
 
-    virtual void PaintBackground(wxDC& dc,
-                                 const wxRect& rectCell,
-                                 const wxGridCellAttr& attr) wxOVERRIDE;
-
     virtual void BeginEdit(int row, int col, wxGrid* grid) wxOVERRIDE;
     virtual bool EndEdit(int row, int col, const wxGrid* grid,
                          const wxString& oldval, wxString *newval) wxOVERRIDE;
diff --git a/src/generic/grideditors.cpp b/src/generic/grideditors.cpp
index 259dcfff3b..bff361f195 100644
--- a/src/generic/grideditors.cpp
+++ b/src/generic/grideditors.cpp
@@ -1459,19 +1459,6 @@ void wxGridCellChoiceEditor::SetSize(const wxRect& rect)
     wxGridCellEditor::SetSize(rectChoice.CenterIn(rect, wxVERTICAL));
 }
 
-void wxGridCellChoiceEditor::PaintBackground(wxDC& dc,
-                                             const wxRect& rectCell,
-                                             const wxGridCellAttr& attr)
-{
-    // as we fill the entire client area, don't do anything here to minimize
-    // flicker
-
-    // TODO: It doesn't actually fill the client area since the height of a
-    // combo always defaults to the standard.  Until someone has time to
-    // figure out the right rectangle to paint, just do it the normal way.
-    wxGridCellEditor::PaintBackground(dc, rectCell, attr);
-}
-
 void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid)
 {
     wxASSERT_MSG(m_control,